hurui
/
hai-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
dev-discount
袁野 2 years ago
parent 17d7c9cee4 34a73814ea
commit 5f749c0ba9
4 changed files with 193 additions and 98 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 37
      hai-service/src/main/java/com/hai/dao/BsMsgMapper.java
  2. 46
      hai-service/src/main/java/com/hai/dao/BsMsgSqlProvider.java
  3. 52
      hai-service/src/main/java/com/hai/entity/BsMsg.java
  4. 156
      hai-service/src/main/java/com/hai/entity/BsMsgExample.java

37
hai-service/src/main/java/com/hai/dao/BsMsgMapper.java
Unescape View File

@ -42,17 +42,19 @@ public interface BsMsgMapper extends BsMsgMapperExt {
"insert into bs_msg (title, `type`, ",
"jump_type, msg_type, ",
"object_id, image, ",
"content, op_id, op_name, ",
"company_id, create_time, ",
"update_time, ext_1, ",
"ext_2, ext_3)",
"content, update_time, ",
"op_name, company_id, ",
"create_time, op_id, ",
"`status`, ext_1, ext_2, ",
"ext_3)",
"values (#{title,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, ",
"#{jumpType,jdbcType=INTEGER}, #{msgType,jdbcType=INTEGER}, ",
"#{objectId,jdbcType=BIGINT}, #{image,jdbcType=VARCHAR}, ",
"#{content,jdbcType=VARCHAR}, #{opId,jdbcType=BIGINT}, #{opName,jdbcType=VARCHAR}, ",
"#{companyId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, ",
"#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ",
"#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
"#{content,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, ",
"#{opName,jdbcType=VARCHAR}, #{companyId,jdbcType=BIGINT}, ",
"#{createTime,jdbcType=TIMESTAMP}, #{opId,jdbcType=BIGINT}, ",
"#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ",
"#{ext3,jdbcType=VARCHAR})"
})
@Options(useGeneratedKeys=true,keyProperty="id")
int insert(BsMsg record);
@ -71,11 +73,12 @@ public interface BsMsgMapper extends BsMsgMapperExt {
@Result(column="object_id", property="objectId", jdbcType=JdbcType.BIGINT),
@Result(column="image", property="image", jdbcType=JdbcType.VARCHAR),
@Result(column="content", property="content", jdbcType=JdbcType.VARCHAR),
@Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR),
@Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR)
@ -84,8 +87,8 @@ public interface BsMsgMapper extends BsMsgMapperExt {
@Select({
"select",
"id, title, `type`, jump_type, msg_type, object_id, image, content, op_id, op_name, ",
"company_id, create_time, update_time, ext_1, ext_2, ext_3",
"id, title, `type`, jump_type, msg_type, object_id, image, content, update_time, ",
"op_name, company_id, create_time, op_id, `status`, ext_1, ext_2, ext_3",
"from bs_msg",
"where id = #{id,jdbcType=BIGINT}"
})
@ -98,11 +101,12 @@ public interface BsMsgMapper extends BsMsgMapperExt {
@Result(column="object_id", property="objectId", jdbcType=JdbcType.BIGINT),
@Result(column="image", property="image", jdbcType=JdbcType.VARCHAR),
@Result(column="content", property="content", jdbcType=JdbcType.VARCHAR),
@Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR),
@Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
@Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR)
@ -127,11 +131,12 @@ public interface BsMsgMapper extends BsMsgMapperExt {
"object_id = #{objectId,jdbcType=BIGINT},",
"image = #{image,jdbcType=VARCHAR},",
"content = #{content,jdbcType=VARCHAR},",
"op_id = #{opId,jdbcType=BIGINT},",
"update_time = #{updateTime,jdbcType=TIMESTAMP},",
"op_name = #{opName,jdbcType=VARCHAR},",
"company_id = #{companyId,jdbcType=BIGINT},",
"create_time = #{createTime,jdbcType=TIMESTAMP},",
"update_time = #{updateTime,jdbcType=TIMESTAMP},",
"op_id = #{opId,jdbcType=BIGINT},",
"`status` = #{status,jdbcType=INTEGER},",
"ext_1 = #{ext1,jdbcType=VARCHAR},",
"ext_2 = #{ext2,jdbcType=VARCHAR},",
"ext_3 = #{ext3,jdbcType=VARCHAR}",

46
hai-service/src/main/java/com/hai/dao/BsMsgSqlProvider.java
Unescape View File

@ -56,8 +56,8 @@ public class BsMsgSqlProvider {
sql.VALUES("content", "#{content,jdbcType=VARCHAR}");
}
if (record.getOpId() != null) {
sql.VALUES("op_id", "#{opId,jdbcType=BIGINT}");
if (record.getUpdateTime() != null) {
sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}");
}
if (record.getOpName() != null) {
@ -72,8 +72,12 @@ public class BsMsgSqlProvider {
sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}");
}
if (record.getUpdateTime() != null) {
sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}");
if (record.getOpId() != null) {
sql.VALUES("op_id", "#{opId,jdbcType=BIGINT}");
}
if (record.getStatus() != null) {
sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
}
if (record.getExt1() != null) {
@ -105,11 +109,12 @@ public class BsMsgSqlProvider {
sql.SELECT("object_id");
sql.SELECT("image");
sql.SELECT("content");
sql.SELECT("op_id");
sql.SELECT("update_time");
sql.SELECT("op_name");
sql.SELECT("company_id");
sql.SELECT("create_time");
sql.SELECT("update_time");
sql.SELECT("op_id");
sql.SELECT("`status`");
sql.SELECT("ext_1");
sql.SELECT("ext_2");
sql.SELECT("ext_3");
@ -162,8 +167,8 @@ public class BsMsgSqlProvider {
sql.SET("content = #{record.content,jdbcType=VARCHAR}");
}
if (record.getOpId() != null) {
sql.SET("op_id = #{record.opId,jdbcType=BIGINT}");
if (record.getUpdateTime() != null) {
sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
}
if (record.getOpName() != null) {
@ -178,8 +183,12 @@ public class BsMsgSqlProvider {
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
}
if (record.getUpdateTime() != null) {
sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
if (record.getOpId() != null) {
sql.SET("op_id = #{record.opId,jdbcType=BIGINT}");
}
if (record.getStatus() != null) {
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
}
if (record.getExt1() != null) {
@ -210,11 +219,12 @@ public class BsMsgSqlProvider {
sql.SET("object_id = #{record.objectId,jdbcType=BIGINT}");
sql.SET("image = #{record.image,jdbcType=VARCHAR}");
sql.SET("content = #{record.content,jdbcType=VARCHAR}");
sql.SET("op_id = #{record.opId,jdbcType=BIGINT}");
sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
sql.SET("op_name = #{record.opName,jdbcType=VARCHAR}");
sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}");
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
sql.SET("op_id = #{record.opId,jdbcType=BIGINT}");
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}");
@ -256,8 +266,8 @@ public class BsMsgSqlProvider {
sql.SET("content = #{content,jdbcType=VARCHAR}");
}
if (record.getOpId() != null) {
sql.SET("op_id = #{opId,jdbcType=BIGINT}");
if (record.getUpdateTime() != null) {
sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}");
}
if (record.getOpName() != null) {
@ -272,8 +282,12 @@ public class BsMsgSqlProvider {
sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}");
}
if (record.getUpdateTime() != null) {
sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}");
if (record.getOpId() != null) {
sql.SET("op_id = #{opId,jdbcType=BIGINT}");
}
if (record.getStatus() != null) {
sql.SET("`status` = #{status,jdbcType=INTEGER}");
}
if (record.getExt1() != null) {

52
hai-service/src/main/java/com/hai/entity/BsMsg.java
Unescape View File

@ -54,9 +54,9 @@ public class BsMsg implements Serializable {
private String content;
/**
* 操作人员
* 更新时间
*/
private Long opId;
private Date updateTime;
/**
* 操作人员名称
@ -74,9 +74,14 @@ public class BsMsg implements Serializable {
private Date createTime;
/**
* 更新时间
* 操作人员
*/
private Date updateTime;
private Long opId;
/**
* 1:编辑中 2：发布 0：删除
*/
private Integer status;
/**
* ext_1
@ -159,12 +164,12 @@ public class BsMsg implements Serializable {
this.content = content;
}
public Long getOpId() {
return opId;
public Date getUpdateTime() {
return updateTime;
}
public void setOpId(Long opId) {
this.opId = opId;
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getOpName() {
@ -191,12 +196,20 @@ public class BsMsg implements Serializable {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
public Long getOpId() {
return opId;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
public void setOpId(Long opId) {
this.opId = opId;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public String getExt1() {
@ -243,11 +256,12 @@ public class BsMsg implements Serializable {
&& (this.getObjectId() == null ? other.getObjectId() == null : this.getObjectId().equals(other.getObjectId()))
&& (this.getImage() == null ? other.getImage() == null : this.getImage().equals(other.getImage()))
&& (this.getContent() == null ? other.getContent() == null : this.getContent().equals(other.getContent()))
&& (this.getOpId() == null ? other.getOpId() == null : this.getOpId().equals(other.getOpId()))
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
&& (this.getOpName() == null ? other.getOpName() == null : this.getOpName().equals(other.getOpName()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
&& (this.getOpId() == null ? other.getOpId() == null : this.getOpId().equals(other.getOpId()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
&& (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2()))
&& (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3()));
@ -265,11 +279,12 @@ public class BsMsg implements Serializable {
result = prime * result + ((getObjectId() == null) ? 0 : getObjectId().hashCode());
result = prime * result + ((getImage() == null) ? 0 : getImage().hashCode());
result = prime * result + ((getContent() == null) ? 0 : getContent().hashCode());
result = prime * result + ((getOpId() == null) ? 0 : getOpId().hashCode());
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
result = prime * result + ((getOpName() == null) ? 0 : getOpName().hashCode());
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
result = prime * result + ((getOpId() == null) ? 0 : getOpId().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode());
@ -290,11 +305,12 @@ public class BsMsg implements Serializable {
sb.append(", objectId=").append(objectId);
sb.append(", image=").append(image);
sb.append(", content=").append(content);
sb.append(", opId=").append(opId);
sb.append(", updateTime=").append(updateTime);
sb.append(", opName=").append(opName);
sb.append(", companyId=").append(companyId);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", opId=").append(opId);
sb.append(", status=").append(status);
sb.append(", ext1=").append(ext1);
sb.append(", ext2=").append(ext2);
sb.append(", ext3=").append(ext3);

156
hai-service/src/main/java/com/hai/entity/BsMsgExample.java
Unescape View File

@ -635,63 +635,63 @@ public class BsMsgExample {
return (Criteria) this;
}
public Criteria andOpIdIsNull() {
addCriterion("op_id is null");
public Criteria andUpdateTimeIsNull() {
addCriterion("update_time is null");
return (Criteria) this;
}
public Criteria andOpIdIsNotNull() {
addCriterion("op_id is not null");
public Criteria andUpdateTimeIsNotNull() {
addCriterion("update_time is not null");
return (Criteria) this;
}
public Criteria andOpIdEqualTo(Long value) {
addCriterion("op_id =", value, "opId");
public Criteria andUpdateTimeEqualTo(Date value) {
addCriterion("update_time =", value, "updateTime");
return (Criteria) this;
}
public Criteria andOpIdNotEqualTo(Long value) {
addCriterion("op_id <>", value, "opId");
public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("update_time <>", value, "updateTime");
return (Criteria) this;
}
public Criteria andOpIdGreaterThan(Long value) {
addCriterion("op_id >", value, "opId");
public Criteria andUpdateTimeGreaterThan(Date value) {
addCriterion("update_time >", value, "updateTime");
return (Criteria) this;
}
public Criteria andOpIdGreaterThanOrEqualTo(Long value) {
addCriterion("op_id >=", value, "opId");
public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("update_time >=", value, "updateTime");
return (Criteria) this;
}
public Criteria andOpIdLessThan(Long value) {
addCriterion("op_id <", value, "opId");
public Criteria andUpdateTimeLessThan(Date value) {
addCriterion("update_time <", value, "updateTime");
return (Criteria) this;
}
public Criteria andOpIdLessThanOrEqualTo(Long value) {
addCriterion("op_id <=", value, "opId");
public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
addCriterion("update_time <=", value, "updateTime");
return (Criteria) this;
}
public Criteria andOpIdIn(List<Long> values) {
addCriterion("op_id in", values, "opId");
public Criteria andUpdateTimeIn(List<Date> values) {
addCriterion("update_time in", values, "updateTime");
return (Criteria) this;
}
public Criteria andOpIdNotIn(List<Long> values) {
addCriterion("op_id not in", values, "opId");
public Criteria andUpdateTimeNotIn(List<Date> values) {
addCriterion("update_time not in", values, "updateTime");
return (Criteria) this;
}
public Criteria andOpIdBetween(Long value1, Long value2) {
addCriterion("op_id between", value1, value2, "opId");
public Criteria andUpdateTimeBetween(Date value1, Date value2) {
addCriterion("update_time between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andOpIdNotBetween(Long value1, Long value2) {
addCriterion("op_id not between", value1, value2, "opId");
public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
addCriterion("update_time not between", value1, value2, "updateTime");
return (Criteria) this;
}
@ -885,63 +885,123 @@ public class BsMsgExample {
return (Criteria) this;
}
public Criteria andUpdateTimeIsNull() {
addCriterion("update_time is null");
public Criteria andOpIdIsNull() {
addCriterion("op_id is null");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNotNull() {
addCriterion("update_time is not null");
public Criteria andOpIdIsNotNull() {
addCriterion("op_id is not null");
return (Criteria) this;
}
public Criteria andUpdateTimeEqualTo(Date value) {
addCriterion("update_time =", value, "updateTime");
public Criteria andOpIdEqualTo(Long value) {
addCriterion("op_id =", value, "opId");
return (Criteria) this;
}
public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("update_time <>", value, "updateTime");
public Criteria andOpIdNotEqualTo(Long value) {
addCriterion("op_id <>", value, "opId");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThan(Date value) {
addCriterion("update_time >", value, "updateTime");
public Criteria andOpIdGreaterThan(Long value) {
addCriterion("op_id >", value, "opId");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("update_time >=", value, "updateTime");
public Criteria andOpIdGreaterThanOrEqualTo(Long value) {
addCriterion("op_id >=", value, "opId");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThan(Date value) {
addCriterion("update_time <", value, "updateTime");
public Criteria andOpIdLessThan(Long value) {
addCriterion("op_id <", value, "opId");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
addCriterion("update_time <=", value, "updateTime");
public Criteria andOpIdLessThanOrEqualTo(Long value) {
addCriterion("op_id <=", value, "opId");
return (Criteria) this;
}
public Criteria andUpdateTimeIn(List<Date> values) {
addCriterion("update_time in", values, "updateTime");
public Criteria andOpIdIn(List<Long> values) {
addCriterion("op_id in", values, "opId");
return (Criteria) this;
}
public Criteria andUpdateTimeNotIn(List<Date> values) {
addCriterion("update_time not in", values, "updateTime");
public Criteria andOpIdNotIn(List<Long> values) {
addCriterion("op_id not in", values, "opId");
return (Criteria) this;
}
public Criteria andUpdateTimeBetween(Date value1, Date value2) {
addCriterion("update_time between", value1, value2, "updateTime");
public Criteria andOpIdBetween(Long value1, Long value2) {
addCriterion("op_id between", value1, value2, "opId");
return (Criteria) this;
}
public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
addCriterion("update_time not between", value1, value2, "updateTime");
public Criteria andOpIdNotBetween(Long value1, Long value2) {
addCriterion("op_id not between", value1, value2, "opId");
return (Criteria) this;
}
public Criteria andStatusIsNull() {
addCriterion("`status` is null");
return (Criteria) this;
}
public Criteria andStatusIsNotNull() {
addCriterion("`status` is not null");
return (Criteria) this;
}
public Criteria andStatusEqualTo(Integer value) {
addCriterion("`status` =", value, "status");
return (Criteria) this;
}
public Criteria andStatusNotEqualTo(Integer value) {
addCriterion("`status` <>", value, "status");
return (Criteria) this;
}
public Criteria andStatusGreaterThan(Integer value) {
addCriterion("`status` >", value, "status");
return (Criteria) this;
}
public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
addCriterion("`status` >=", value, "status");
return (Criteria) this;
}
public Criteria andStatusLessThan(Integer value) {
addCriterion("`status` <", value, "status");
return (Criteria) this;
}
public Criteria andStatusLessThanOrEqualTo(Integer value) {
addCriterion("`status` <=", value, "status");
return (Criteria) this;
}
public Criteria andStatusIn(List<Integer> values) {
addCriterion("`status` in", values, "status");
return (Criteria) this;
}
public Criteria andStatusNotIn(List<Integer> values) {
addCriterion("`status` not in", values, "status");
return (Criteria) this;
}
public Criteria andStatusBetween(Integer value1, Integer value2) {
addCriterion("`status` between", value1, value2, "status");
return (Criteria) this;
}
public Criteria andStatusNotBetween(Integer value1, Integer value2) {
addCriterion("`status` not between", value1, value2, "status");
return (Criteria) this;
}

Write Preview
Loading…
Cancel
Save