Skip to content

GitLab

Q
qk_backend
Commit 4b76075a authored by shiyu's avatar shiyu
Browse files
Options

Merge remote-tracking branch 'origin/quanku_0930' into quanku_0930

parents 0ceb0afa 76bb1d6f
Hide whitespace changes
Inline Side-by-side
Showing with 174 additions and 15 deletions
ch-dao/src/main/java/com/wwdz/ch/db/domain/Item.java
View file @ 4b76075a
package com.wwdz.ch.db.domain;
import java.io.Serializable;
import com.xxdxxs.entity.Entity;
import lombok.Data;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import com.xxdxxs.entity.Entity;
import lombok.Data;
/**
* @author shiyu
* @date 2023/08/28
* @date 2023/09/15
*/
@Data
public class Item implements Entity {
......@@ -106,6 +105,11 @@ public class Item implements Entity {
*/
private Integer kind;
/**
* 查看权限(0所有人,1仅自己可见)
*/
private Integer viewPermission;
/**
* 商品额外信息
*/
......@@ -158,6 +162,7 @@ public class Item implements Entity {
sb.append(", originalSourceUrl=").append(originalSourceUrl);
sb.append(", source=").append(source);
sb.append(", kind=").append(kind);
sb.append(", viewPermission=").append(viewPermission);
sb.append(", extra=").append(extra);
sb.append(", images=").append(images);
sb.append(", videos=").append(videos);
......@@ -199,6 +204,7 @@ public class Item implements Entity {
&& (this.getOriginalSourceUrl() == null ? other.getOriginalSourceUrl() == null : this.getOriginalSourceUrl().equals(other.getOriginalSourceUrl()))
&& (this.getSource() == null ? other.getSource() == null : this.getSource().equals(other.getSource()))
&& (this.getKind() == null ? other.getKind() == null : this.getKind().equals(other.getKind()))
&& (this.getViewPermission() == null ? other.getViewPermission() == null : this.getViewPermission().equals(other.getViewPermission()))
&& (this.getExtra() == null ? other.getExtra() == null : this.getExtra().equals(other.getExtra()))
&& (this.getImages() == null ? other.getImages() == null : this.getImages().equals(other.getImages()))
&& (this.getVideos() == null ? other.getVideos() == null : this.getVideos().equals(other.getVideos()))
......@@ -229,6 +235,7 @@ public class Item implements Entity {
result = prime * result + ((getOriginalSourceUrl() == null) ? 0 : getOriginalSourceUrl().hashCode());
result = prime * result + ((getSource() == null) ? 0 : getSource().hashCode());
result = prime * result + ((getKind() == null) ? 0 : getKind().hashCode());
result = prime * result + ((getViewPermission() == null) ? 0 : getViewPermission().hashCode());
result = prime * result + ((getExtra() == null) ? 0 : getExtra().hashCode());
result = prime * result + ((getImages() == null) ? 0 : getImages().hashCode());
result = prime * result + ((getVideos() == null) ? 0 : getVideos().hashCode());
......@@ -264,6 +271,7 @@ public class Item implements Entity {
originalSourceUrl("original_source_url", "originalSourceUrl", "VARCHAR", false),
source("source", "source", "INTEGER", true),
kind("kind", "kind", "INTEGER", false),
viewPermission("view_permission", "viewPermission", "INTEGER", false),
extra("extra", "extra", "LONGVARCHAR", false),
images("images", "images", "LONGVARCHAR", false),
videos("videos", "videos", "LONGVARCHAR", false),
......
ch-dao/src/main/java/com/wwdz/ch/db/domain/ItemExample.java
View file @ 4b76075a
......@@ -2715,6 +2715,138 @@ public class ItemExample {
addCriterion("kind not between", value1, value2, "kind");
return (Criteria) this;
}
public Criteria andViewPermissionIsNull() {
addCriterion("view_permission is null");
return (Criteria) this;
}
public Criteria andViewPermissionIsNotNull() {
addCriterion("view_permission is not null");
return (Criteria) this;
}
public Criteria andViewPermissionEqualTo(Integer value) {
addCriterion("view_permission =", value, "viewPermission");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table item
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andViewPermissionEqualToColumn(Item.Column column) {
addCriterion(new StringBuilder("view_permission = ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andViewPermissionNotEqualTo(Integer value) {
addCriterion("view_permission <>", value, "viewPermission");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table item
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andViewPermissionNotEqualToColumn(Item.Column column) {
addCriterion(new StringBuilder("view_permission <> ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andViewPermissionGreaterThan(Integer value) {
addCriterion("view_permission >", value, "viewPermission");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table item
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andViewPermissionGreaterThanColumn(Item.Column column) {
addCriterion(new StringBuilder("view_permission > ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andViewPermissionGreaterThanOrEqualTo(Integer value) {
addCriterion("view_permission >=", value, "viewPermission");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table item
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andViewPermissionGreaterThanOrEqualToColumn(Item.Column column) {
addCriterion(new StringBuilder("view_permission >= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andViewPermissionLessThan(Integer value) {
addCriterion("view_permission <", value, "viewPermission");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table item
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andViewPermissionLessThanColumn(Item.Column column) {
addCriterion(new StringBuilder("view_permission < ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andViewPermissionLessThanOrEqualTo(Integer value) {
addCriterion("view_permission <=", value, "viewPermission");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table item
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andViewPermissionLessThanOrEqualToColumn(Item.Column column) {
addCriterion(new StringBuilder("view_permission <= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andViewPermissionIn(List<Integer> values) {
addCriterion("view_permission in", values, "viewPermission");
return (Criteria) this;
}
public Criteria andViewPermissionNotIn(List<Integer> values) {
addCriterion("view_permission not in", values, "viewPermission");
return (Criteria) this;
}
public Criteria andViewPermissionBetween(Integer value1, Integer value2) {
addCriterion("view_permission between", value1, value2, "viewPermission");
return (Criteria) this;
}
public Criteria andViewPermissionNotBetween(Integer value1, Integer value2) {
addCriterion("view_permission not between", value1, value2, "viewPermission");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {
......
ch-dao/src/main/resources/com/wwdz/ch/db/mapper/ItemMapper.xml
View file @ 4b76075a
......@@ -21,6 +21,7 @@
<result column="original_source_url" jdbcType="VARCHAR" property="originalSourceUrl" />
<result column="source" jdbcType="INTEGER" property="source" />
<result column="kind" jdbcType="INTEGER" property="kind" />
<result column="view_permission" jdbcType="INTEGER" property="viewPermission" />
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.wwdz.ch.db.domain.Item">
<result column="extra" jdbcType="LONGVARCHAR" property="extra" />
......@@ -92,7 +93,7 @@
<sql id="Base_Column_List">
id, `name`, cid, is_on_sale, is_std, sort, share_image, top_image, price, create_time,
source_type, update_time, is_deleted, bid_time, remark, `state`, original_source_url,
`source`, kind
`source`, kind, view_permission
</sql>
<sql id="Blob_Column_List">
extra, images, videos, detail, original_extra
......@@ -149,7 +150,7 @@
<otherwise>
id, `name`, cid, is_on_sale, is_std, sort, share_image, top_image, price, create_time,
source_type, update_time, is_deleted, bid_time, remark, `state`, original_source_url,
`source`, kind, extra, images, videos, detail, original_extra
`source`, kind, view_permission, extra, images, videos, detail, original_extra
</otherwise>
</choose>
from item
......@@ -184,7 +185,7 @@
<otherwise>
id, `name`, cid, is_on_sale, is_std, sort, share_image, top_image, price, create_time,
source_type, update_time, is_deleted, bid_time, remark, `state`, original_source_url,
`source`, kind, extra, images, videos, detail, original_extra
`source`, kind, view_permission, extra, images, videos, detail, original_extra
</otherwise>
</choose>
from item
......@@ -210,16 +211,18 @@
source_type, update_time, is_deleted,
bid_time, remark, `state`,
original_source_url, `source`, kind,
extra, images, videos,
detail, original_extra)
view_permission, extra, images,
videos, detail, original_extra
)
values (#{name,jdbcType=VARCHAR}, #{cid,jdbcType=INTEGER}, #{isOnSale,jdbcType=BIT},
#{isStd,jdbcType=BIT}, #{sort,jdbcType=INTEGER}, #{shareImage,jdbcType=VARCHAR},
#{topImage,jdbcType=VARCHAR}, #{price,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP},
#{sourceType,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, #{isDeleted,jdbcType=BIT},
#{bidTime,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{state,jdbcType=INTEGER},
#{originalSourceUrl,jdbcType=VARCHAR}, #{source,jdbcType=INTEGER}, #{kind,jdbcType=INTEGER},
#{extra,jdbcType=LONGVARCHAR}, #{images,jdbcType=LONGVARCHAR}, #{videos,jdbcType=LONGVARCHAR},
#{detail,jdbcType=LONGVARCHAR}, #{originalExtra,jdbcType=LONGVARCHAR})
#{viewPermission,jdbcType=INTEGER}, #{extra,jdbcType=LONGVARCHAR}, #{images,jdbcType=LONGVARCHAR},
#{videos,jdbcType=LONGVARCHAR}, #{detail,jdbcType=LONGVARCHAR}, #{originalExtra,jdbcType=LONGVARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.Item">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
......@@ -281,6 +284,9 @@
<if test="kind != null">
kind,
</if>
<if test="viewPermission != null">
view_permission,
</if>
<if test="extra != null">
extra,
</if>
......@@ -352,6 +358,9 @@
<if test="kind != null">
#{kind,jdbcType=INTEGER},
</if>
<if test="viewPermission != null">
#{viewPermission,jdbcType=INTEGER},
</if>
<if test="extra != null">
#{extra,jdbcType=LONGVARCHAR},
</if>
......@@ -435,6 +444,9 @@
<if test="record.kind != null">
kind = #{record.kind,jdbcType=INTEGER},
</if>
<if test="record.viewPermission != null">
view_permission = #{record.viewPermission,jdbcType=INTEGER},
</if>
<if test="record.extra != null">
extra = #{record.extra,jdbcType=LONGVARCHAR},
</if>
......@@ -476,6 +488,7 @@
original_source_url = #{record.originalSourceUrl,jdbcType=VARCHAR},
`source` = #{record.source,jdbcType=INTEGER},
kind = #{record.kind,jdbcType=INTEGER},
view_permission = #{record.viewPermission,jdbcType=INTEGER},
extra = #{record.extra,jdbcType=LONGVARCHAR},
images = #{record.images,jdbcType=LONGVARCHAR},
videos = #{record.videos,jdbcType=LONGVARCHAR},
......@@ -505,7 +518,8 @@
`state` = #{record.state,jdbcType=INTEGER},
original_source_url = #{record.originalSourceUrl,jdbcType=VARCHAR},
`source` = #{record.source,jdbcType=INTEGER},
kind = #{record.kind,jdbcType=INTEGER}
kind = #{record.kind,jdbcType=INTEGER},
view_permission = #{record.viewPermission,jdbcType=INTEGER}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -567,6 +581,9 @@
<if test="kind != null">
kind = #{kind,jdbcType=INTEGER},
</if>
<if test="viewPermission != null">
view_permission = #{viewPermission,jdbcType=INTEGER},
</if>
<if test="extra != null">
extra = #{extra,jdbcType=LONGVARCHAR},
</if>
......@@ -605,6 +622,7 @@
original_source_url = #{originalSourceUrl,jdbcType=VARCHAR},
`source` = #{source,jdbcType=INTEGER},
kind = #{kind,jdbcType=INTEGER},
view_permission = #{viewPermission,jdbcType=INTEGER},
extra = #{extra,jdbcType=LONGVARCHAR},
images = #{images,jdbcType=LONGVARCHAR},
videos = #{videos,jdbcType=LONGVARCHAR},
......@@ -631,7 +649,8 @@
`state` = #{state,jdbcType=INTEGER},
original_source_url = #{originalSourceUrl,jdbcType=VARCHAR},
`source` = #{source,jdbcType=INTEGER},
kind = #{kind,jdbcType=INTEGER}
kind = #{kind,jdbcType=INTEGER},
view_permission = #{viewPermission,jdbcType=INTEGER}
where id = #{id,jdbcType=BIGINT}
</update>
<select id="selectOneByExample" parameterType="com.wwdz.ch.db.domain.ItemExample" resultMap="BaseResultMap">
......@@ -689,7 +708,7 @@
<otherwise>
id, `name`, cid, is_on_sale, is_std, sort, share_image, top_image, price, create_time,
source_type, update_time, is_deleted, bid_time, remark, `state`, original_source_url,
`source`, kind, extra, images, videos, detail, original_extra
`source`, kind, view_permission, extra, images, videos, detail, original_extra
</otherwise>
</choose>
from item
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment