From 5ed8aa196eda2e6be4ad8cc632693ec16c8565a6 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 18 八月 2022 20:14:41 +0800
Subject: [PATCH] 整改
---
phi-sms-feign/src/main/java/com/hz/sms/dto/SmsGeneralSendDto.java | 78 +++++++++++++++++---------------------
1 files changed, 35 insertions(+), 43 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 efd1106..28d1f27 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,56 +1,48 @@
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;
- /*鎵嬫満鍙风爜*/
- private String phone;
- /*瀹氭椂鍙戦�佺煭淇℃椂闂�*/
- private String sendtime;
- /*濡傞渶鐘舵�佹姤鍛婂垯浼爐rue*/
- private String report;
- /*涓嬪彂鐭俊鍙风爜鎵╁睍鐮�*/
- private String extend;
- /*璇ユ潯鐭俊鍦ㄦ偍涓氬姟绯荤粺鍐呯殑ID*/
- private String uid;
- /*鐭俊绫诲瀷*/
+ /**鐭俊绫诲瀷 - Y*/
private Integer smsType;
- /* 鍙戦�佺姸鎬� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦��)*/
- private Integer sendStatus;
+ /**鐭俊鍐呭 - Y*/
+ private String msg;
+ /**鎺ユ敹浜哄悕绉� - N*/
+ private String receiveMan;
+ /**鎵嬫満鍙风爜 - Y*/
+ private String phone;
+ /**瀹氭椂鍙戦�佺煭淇℃椂闂达紝鍊煎皬浜庢垨绛変簬褰撳墠鏃堕棿鍒欑珛鍗冲彂閫侊紝榛樿绔嬪嵆鍙戦�侊細鏍煎紡yyyy-MM-dd HH:mm:dd*/
+ private Date sendTime;
+ /**濡傞渶鐘舵�佹姤鍛婂垯浼爐rue*/
+ private String report;
+ /**涓嬪彂鐭俊鍙风爜鎵╁睍鐮� - N*/
+ private String extend;
+ /**璇ユ潯鐭俊鍦ㄦ偍涓氬姟绯荤粺鍐呯殑ID锛屽彲涓嶅～ - N*/
+ private String uid;
+ /** 鍙戦�佹ā寮� (0: 绔嬪嵆鍙戦��; 1:寮傛鍙戦�侊紝榛樿1) - Y*/
+ private Integer sendModel = SEND_TYPE_ASYNCHRONOUS;
+
+ /**鐭俊绫诲瀷-鐭俊楠岃瘉鐮�*/
+ public static final int SMS_TYPE_VERIFICATION = 0;
+ /**鐭俊绫诲瀷-閫氱煡鐭俊*/
+ public static final int SMS_TYPE_NOTICE = 1;
+ /**鐭俊绫诲瀷-钀ラ攢鐭俊*/
+ public static final int SMS_TYPE_MARKETING= 2;
+
+ /**鍙戦�佺被鍨�-绔嬪嵆鍙戦��*/
+ public static final int SEND_TYPE_IMMEDIATELY = 0;
+ /**鍙戦�佺被鍨�-寮傛鍙戦��*/
+ public static final int SEND_TYPE_ASYNCHRONOUS = 1;
+
+ /**鏁板瓧0*/
+ public static final int NUMBER_0 = 0;
+ /**鏁板瓧1*/
+ public static final int NUMBER_1 = 1;
- public Date getDateSendTime(){
- try {
- Date dateSendTime = new SimpleDateFormat("yyyyMMddHHmm").parse(sendtime);
- return dateSendTime;
- }catch (Exception e){
- return null;
- }
- }
- public String getReport() {
- if (!StringUtils.isEmpty(report) && !"true".equals(report)){
- return null;
- }
- return report;
- }
+
}
--
Gitblit v1.8.0