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/TemplateMessageDto.java |  109 ++++++++++++++++--------------------------------------
 1 files changed, 33 insertions(+), 76 deletions(-)

diff --git a/phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMessageDto.java b/phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMessageDto.java
index 994cd6e..f093f8b 100644
--- a/phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMessageDto.java
+++ b/phi-sms-feign/src/main/java/com/hz/sms/dto/TemplateMessageDto.java
@@ -1,105 +1,62 @@
 package com.hz.sms.dto;
 
+import lombok.Data;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.util.ObjectUtils;
+
+@Data
 public class TemplateMessageDto {
-    /** 鏍囪瘑 */
+    /** 浼佷笟寰俊id*/
+    private String corpId;
+    /** 鍏宠仈灏忕▼搴廼d*/
+    private String appId;
+
+    /** 鏍囪瘑 (璁板綍corp_wx_application琛ㄦ暟鎹殑id) (涓嶇敤浼�)*/
     private String id;
-    /** 浼佷笟ID */
-    private String corpid;
     /** 鎴愬憳ID鍒楄〃锛堟秷鎭帴鏀惰�咃紝澶氫釜鎺ユ敹鑰呯敤鈥榺鈥欏垎闅旓紝鏈�澶氭敮鎸�1000涓級 */
-    private String touser;
+    private String touSer;
     /** 閮ㄩ棬ID鍒楄〃锛屽涓帴鏀惰�呯敤鈥榺鈥欏垎闅旓紝鏈�澶氭敮鎸�100涓�� */
     private String toparty;
     /** 鏍囩ID鍒楄〃锛屽涓帴鏀惰�呯敤鈥榺鈥欏垎闅旓紝鏈�澶氭敮鎸�100涓�� */
-    private String totag;
+    private String toTag;
     /** 娑堟伅绫诲瀷 ,姝ゆ椂鍥哄畾涓猴細miniprogram_notice */
-    private String msgtype = "miniprogram_notice";
+    private String msgType;
     /** 鍙傛暟鍐呭 */
     private TemplateMsgDto miniprogram_notice;
 
     /** 琛ㄧず鏄惁寮�鍚痠d杞瘧锛�0琛ㄧず鍚︼紝1琛ㄧず鏄紝榛樿0 */
-    private Integer enable_id_trans = 0;
+    private Integer enable_id_trans;
     /** 琛ㄧず鏄惁寮�鍚噸澶嶆秷鎭鏌ワ紝0琛ㄧず鍚︼紝1琛ㄧず鏄紝榛樿0 */
-    private Integer enable_duplicate_check = 0;
+    private Integer enable_duplicate_check;
     /** 琛ㄧず鏄惁閲嶅娑堟伅妫�鏌ョ殑鏃堕棿闂撮殧锛岄粯璁�1800s锛屾渶澶т笉瓒呰繃4灏忔椂 */
-    private Integer duplicate_check_interval = 1800;
+    private Integer duplicate_check_interval;
+    /** 鍙戦�佺姸鎬� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦��)*/
+    private Integer sendStatus;
 
-    public String getId() {
-        return id;
+    public String getMsgType() {
+        if (!StringUtils.isEmpty(msgType) && !"miniprogram_notice".equals(msgType)){
+            return null;
+        }
+        return msgType;
     }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getCorpid() {
-        return corpid;
-    }
-
-    public void setCorpid(String corpid) {
-        this.corpid = corpid;
-    }
-
-    public String getTouser() {
-        return touser;
-    }
-
-    public void setTouser(String touser) {
-        this.touser = touser;
-    }
-
-    public String getToparty() {
-        return toparty;
-    }
-
-    public void setToparty(String toparty) {
-        this.toparty = toparty;
-    }
-
-    public String getTotag() {
-        return totag;
-    }
-
-    public void setTotag(String totag) {
-        this.totag = totag;
-    }
-
-    public String getMsgtype() {
-        return msgtype;
-    }
-
-    public void setMsgtype(String msgtype) {
-        this.msgtype = msgtype;
-    }
-
-    public TemplateMsgDto getMiniprogram_notice() {
-        return miniprogram_notice;
-    }
-
-    public void setMiniprogram_notice(TemplateMsgDto miniprogram_notice) {
-        this.miniprogram_notice = miniprogram_notice;
-    }
-
     public Integer getEnable_id_trans() {
+        if (ObjectUtils.isEmpty(enable_id_trans)){
+            return null;
+        }
         return enable_id_trans;
     }
 
-    public void setEnable_id_trans(Integer enable_id_trans) {
-        this.enable_id_trans = enable_id_trans;
-    }
-
     public Integer getEnable_duplicate_check() {
+        if (ObjectUtils.isEmpty(enable_duplicate_check)){
+            return null;
+        }
         return enable_duplicate_check;
     }
 
-    public void setEnable_duplicate_check(Integer enable_duplicate_check) {
-        this.enable_duplicate_check = enable_duplicate_check;
-    }
-
     public Integer getDuplicate_check_interval() {
+        if (ObjectUtils.isEmpty(duplicate_check_interval)){
+            return null;
+        }
         return duplicate_check_interval;
-    }
-
-    public void setDuplicate_check_interval(Integer duplicate_check_interval) {
-        this.duplicate_check_interval = duplicate_check_interval;
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0