From 6fd2bc1768d4e0bc1c54ef1b0ec0c1b6f0120278 Mon Sep 17 00:00:00 2001
From: weizhongxi <2412380450@qq.com>
Date: Fri, 23 Apr 2021 19:49:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=9F=A6=E5=BF=A0=E5=96=9C=E6=8F=90?=
=?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../task/model/SendSmsContenJsonContent.java | 39 +++++++++++++++++++
pom.xml | 19 ++++++++-
2 files changed, 56 insertions(+), 2 deletions(-)
create mode 100644 eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/model/SendSmsContenJsonContent.java
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/model/SendSmsContenJsonContent.java b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/model/SendSmsContenJsonContent.java
new file mode 100644
index 0000000..ed17893
--- /dev/null
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/model/SendSmsContenJsonContent.java
@@ -0,0 +1,39 @@
+package me.zhengjie.modules.buildrecord.task.model;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SendSmsContenJsonContent implements Serializable {
+ /**
+ * 任务名称
+ */
+ @JSONField(name = "taskName")
+ private String taskName;
+
+ /**
+ * 短信内容
+ */
+ @JSONField(name = "smsContent")
+ private String smsContent;
+
+ /**
+ * 短信url
+ */
+ @JSONField(name = "linkUrl")
+ private String linkUrl;
+
+
+ /**
+ * 操作人
+ */
+ @JSONField(name = "operator")
+ private String operator;
+
+}
diff --git a/pom.xml b/pom.xml
index fa76a0e..e80dde8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,11 +127,26 @@
+
+
+
+
+
- org.apache.shardingSphere
+ org.apache.shardingsphere
sharding-jdbc-spring-boot-starter
- 4.0.0-RC1
+ 4.1.1
+
+
+
+
+
+
+
+
+
+
mysql
From 029a0fb2e46e943575f47b57de1764135e75e29b Mon Sep 17 00:00:00 2001
From: weizhongxi <2412380450@qq.com>
Date: Thu, 29 Apr 2021 13:16:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=9F=A6=E5=BF=A0=E5=96=9C=E6=8F=90?=
=?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/me/zhengjie/modules/abmessage/domain/AbMessage.java | 5 +++++
.../abmessage/service/dto/AbMessageQueryCriteria.java | 5 +++++
.../java/me/zhengjie/modules/form/domain/FormMessage.java | 5 +++++
.../modules/form/service/dto/FormMessageQueryCriteria.java | 5 +++++
4 files changed, 20 insertions(+)
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/domain/AbMessage.java b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/domain/AbMessage.java
index 40e975a..b38c66f 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/domain/AbMessage.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/domain/AbMessage.java
@@ -82,6 +82,11 @@ public class AbMessage implements Serializable {
@ApiModelProperty(value = "上游推送时间")
private Timestamp pushTime;
+ /** 添加性别 modify by wzx */
+ @Column(name = "sex")
+ @ApiModelProperty(value = "声纹识别性别标签")
+ private Integer sex;
+
public void copy(AbMessage source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
}
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/dto/AbMessageQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/dto/AbMessageQueryCriteria.java
index 07e0004..34f3596 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/dto/AbMessageQueryCriteria.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/abmessage/service/dto/AbMessageQueryCriteria.java
@@ -34,6 +34,11 @@ public class AbMessageQueryCriteria{
/** 模糊 */
@Query(type = Query.Type.INNER_LIKE)
private String actName;
+
+ /** 精确 查询性别 modify by wzx */
+ @Query
+ private Integer sex;
+
/** BETWEEN */
@Query(type = Query.Type.BETWEEN)
private List startTime;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/form/domain/FormMessage.java b/eladmin-system/src/main/java/me/zhengjie/modules/form/domain/FormMessage.java
index e0f0eef..53f1dc1 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/form/domain/FormMessage.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/form/domain/FormMessage.java
@@ -106,6 +106,11 @@ public class FormMessage implements Serializable {
@ApiModelProperty(value = "最新推送时间")
private Timestamp pushTime;
+ /** 添加性别 modify by wzx */
+ @Column(name = "sex")
+ @ApiModelProperty(value = "声纹识别性别标签")
+ private Integer sex;
+
public void copy(FormMessage source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
}
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/form/service/dto/FormMessageQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/form/service/dto/FormMessageQueryCriteria.java
index 52b3bc2..9950e26 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/form/service/dto/FormMessageQueryCriteria.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/form/service/dto/FormMessageQueryCriteria.java
@@ -47,6 +47,11 @@ public class FormMessageQueryCriteria{
/** 精确 */
@Query
private Integer device;
+
+ /** 精确 查询性别 modify by wzx */
+ @Query
+ private Integer sex;
+
/** BETWEEN */
@Query(type = Query.Type.BETWEEN)
private List startTime;