From 6dde8c033a105f1fc32dc7f6a5fdf4d6900db07b Mon Sep 17 00:00:00 2001
From: 童刚 <pBP8jclM@8yTJ@4h>
Date: 星期五, 12 八月 2022 15:11:24 +0800
Subject: [PATCH] 11

---
 phi-sms-feign/src/main/java/com/hz/sms/dto/SmsGeneralSendDto.java |   89 ++++++++++----------------------------------
 1 files changed, 21 insertions(+), 68 deletions(-)

diff --git a/phi-sms-feign/src/main/java/com/hz/sms/dto/SmsGeneralSendDto.java b/phi-sms-feign/src/main/java/com/hz/sms/dto/SmsGeneralSendDto.java
index 0102b19..efd1106 100644
--- a/phi-sms-feign/src/main/java/com/hz/sms/dto/SmsGeneralSendDto.java
+++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/SmsGeneralSendDto.java
@@ -1,14 +1,25 @@
 package com.hz.sms.dto;
 
 
+import com.hx.util.StringUtils;
+import lombok.Data;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-
+@Data
 public class SmsGeneralSendDto {
 
-    /*鏍囪瘑*/
+    /* 鏍囪瘑 (璁板綍sms_general_item琛ㄦ暟鎹殑id)*/
     private String id;
+    /* 璐﹀彿*/
+    private String account;
+    /* 瀵嗙爜*/
+    private String password;
+    /*绛惧悕*/
+    private String sign;
+    /* 瀹氭椂鐭俊鏃堕棿锛屾牸寮忎负yyyyMMddHHmm锛屽�煎皬浜庢垨绛変簬褰撳墠鏃堕棿鍒欑珛鍗冲彂閫侊紝榛樿绔嬪嵆鍙戦��*/
+    private String timestamp;
     /*鐭俊鍐呭*/
     private String msg;
     /*鎵嬫満鍙风爜*/
@@ -16,53 +27,17 @@
     /*瀹氭椂鍙戦�佺煭淇℃椂闂�*/
     private String sendtime;
     /*濡傞渶鐘舵�佹姤鍛婂垯浼爐rue*/
-    private String report = "false";
+    private String report;
     /*涓嬪彂鐭俊鍙风爜鎵╁睍鐮�*/
     private String extend;
     /*璇ユ潯鐭俊鍦ㄦ偍涓氬姟绯荤粺鍐呯殑ID*/
     private String uid;
+    /*鐭俊绫诲瀷*/
+    private Integer smsType;
+    /* 鍙戦�佺姸鎬� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦��)*/
+    private Integer sendStatus;
 
 
-    public SmsGeneralSendDto() {
-    }
-
-    public SmsGeneralSendDto(String id, String msg, String phone, String sendtime, String report, String extend, String uid) {
-        this.id = id;
-        this.msg = msg;
-        this.phone = phone;
-        this.sendtime = sendtime;
-        this.report = report;
-        this.extend = extend;
-        this.uid = uid;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getSendtime() {
-        return sendtime;
-    }
     public Date getDateSendTime(){
         try {
             Date dateSendTime = new SimpleDateFormat("yyyyMMddHHmm").parse(sendtime);
@@ -72,32 +47,10 @@
         }
     }
 
-    public void setSendtime(String sendtime) {
-        this.sendtime = sendtime;
-    }
-
     public String getReport() {
+        if (!StringUtils.isEmpty(report) && !"true".equals(report)){
+            return null;
+        }
         return report;
     }
-
-    public void setReport(String report) {
-        this.report = report;
-    }
-
-    public String getExtend() {
-        return extend;
-    }
-
-    public void setExtend(String extend) {
-        this.extend = extend;
-    }
-
-    public String getUid() {
-        return uid;
-    }
-
-    public void setUid(String uid) {
-        this.uid = uid;
-    }
-
 }

--
Gitblit v1.8.0