diff --git a/sql/tables.sms.sql b/sql/tables.sms.sql index 38e58da..afbda14 100644 --- a/sql/tables.sms.sql +++ b/sql/tables.sms.sql @@ -6,7 +6,7 @@ CREATE TABLE SPECIALIST ( NAME VARCHAR(50) NOT NULL COMMENT '姓名', POSITION VARCHAR(100) COMMENT '职务', BIRTHDAY DATE COMMENT '生日', - TITLE VARCHAR(20) COMMENT '称呼', + ADDRESS VARCHAR(20) COMMENT '区域', PHONE VARCHAR(20) COMMENT '电话号码', STATUS INT DEFAULT 1 COMMENT '生效状态 1:有效 0:无效', CREATE_TM DATETIME DEFAULT CURRENT_TIME COMMENT '创建日期' diff --git a/src/main/java/com/whdc/model/entity/Specialist.java b/src/main/java/com/whdc/model/entity/Specialist.java index a1ddf0b..ee5049e 100644 --- a/src/main/java/com/whdc/model/entity/Specialist.java +++ b/src/main/java/com/whdc/model/entity/Specialist.java @@ -58,9 +58,9 @@ public class Specialist implements Serializable { /** * 职位称呼 */ - @TableField("TITLE") - @ApiModelProperty(value = "称呼") - private String title; + @TableField("ADDRESS") + @ApiModelProperty(value = "区域") + private String address; /** * 电话号码 diff --git a/src/main/java/com/whdc/service/impl/SmsBirthdayServiceImpl.java b/src/main/java/com/whdc/service/impl/SmsBirthdayServiceImpl.java index 0dff075..da27cfa 100644 --- a/src/main/java/com/whdc/service/impl/SmsBirthdayServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/SmsBirthdayServiceImpl.java @@ -18,7 +18,6 @@ import org.springframework.stereotype.Service; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; @@ -90,8 +89,7 @@ public class SmsBirthdayServiceImpl extends ServiceImpl impl try { // 替换模板中的占位符 String content = template.replace("{姓名}", specialist.getName()) - .replace("{称呼}", specialist.getTitle() != null ? specialist.getTitle() : "") .replace("{主题}", smsTask.getSubjectName()); // 创建短信日志记录 @@ -177,7 +176,7 @@ public class SmsTaskServiceImpl extends ServiceImpl impl failedSmsLog.setName(specialist.getName()) .setPhone(specialist.getPhone()) .setContent(template.replace("{姓名}", specialist.getName()) - .replace("{称呼}", specialist.getTitle() != null ? specialist.getTitle() : "") + .replace("{称呼}", specialist.getAddress() != null ? specialist.getAddress() : "") .replace("{主题}", smsTask.getSubjectName())) .setRemark("主题日短信-" + smsTask.getSubjectName() + "-发送异常: " + e.getMessage()) .setSendTm(new java.util.Date());