From ccdbe4fb59fd91327de50a8de14ff5192e3bf668 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 6 May 2019 14:44:55 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B6=88=E6=81=AF][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=A8=A1=E6=9D=BF=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql | 2 ++ .../com/iformall/domain/po/WxMsgModel.java | 9 -------- .../domain/po/WxMsgValidationcodeModel.java | 11 ++++++++++ .../msg/impl/SendEmailServiceImpl.java | 21 +++++++++++++------ .../resources/mapper/WxMsgModelMapper.xml | 3 +-- .../mapper/WxMsgValidationcodeModelMapper.xml | 4 +++- 6 files changed, 32 insertions(+), 18 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql b/mallinkAdmin/src/main/resources/db/migration/V201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql new file mode 100644 index 000000000..b95b706f1 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql @@ -0,0 +1,2 @@ +delete from wx_msg_model where name in('欠缴账单通知','待缴账单通知','审批通过通知','待办通知','审批通知','驳回通知'); +alter table wx_msg_model drop column email_bg_img; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java index b05947103..fd7f4db89 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java @@ -61,15 +61,6 @@ public class WxMsgModel implements Serializable { @io.swagger.annotations.ApiModelProperty(value="modelid",name="modelId") private Integer modelId; - private String emailBgImg; - - public String getEmailBgImg() { - return emailBgImg; - } - - public void setEmailBgImg(String emailBgImg) { - this.emailBgImg = emailBgImg; - } public String getTenantId() { return tenantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java index b9541ab06..9b22a4f03 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java @@ -67,6 +67,17 @@ public class WxMsgValidationcodeModel implements Serializable { @io.swagger.annotations.ApiModelProperty(value="tenantid",name="tenantId") private String tenantId; + @io.swagger.annotations.ApiModelProperty(value="邮箱背景图片",name="emailBgImg") + private String emailBgImg; + + public String getEmailBgImg() { + return emailBgImg; + } + + public void setEmailBgImg(String emailBgImg) { + this.emailBgImg = emailBgImg; + } + public String getName() { return name; } diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java index fb4b5914a..aba8fe142 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java @@ -1,10 +1,15 @@ package com.iformall.service.msg.impl; +import com.iformall.domain.po.WxMsgValidationcode; +import com.iformall.domain.po.WxMsgValidationcodeModel; import com.iformall.domain.po.msg.BaseMsg; import com.iformall.domain.po.msg.MailMsg; import com.iformall.domain.po.WxMsgModel; import com.iformall.mapper.WxMsgModelMapper; +import com.iformall.mapper.WxMsgValidationcodeMapper; +import com.iformall.mapper.WxMsgValidationcodeModelMapper; import com.iformall.service.msg.MsgSendService; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,8 +20,11 @@ import org.springframework.mail.SimpleMailMessage; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.stereotype.Service; +import org.w3c.dom.stylesheets.LinkStyle; + import javax.mail.internet.MimeMessage; import java.io.File; +import java.util.List; import java.util.Map; /** @@ -30,25 +38,26 @@ public class SendEmailServiceImpl implements MsgSendService { @Autowired private JavaMailSender sender; - @Value("${spring.mail.username}") private String from; - @Autowired private WxMsgModelMapper wxMsgModelMapper; + @Autowired + private WxMsgValidationcodeModelMapper wxMsgValidationcodeModelMapper; @Override public void send(BaseMsg baseMsg) throws Exception{ MailMsg mailMsg = (MailMsg)baseMsg; //根据模板替换动态内容 if(mailMsg.getModelId() != null){ - WxMsgModel msgModel = new WxMsgModel(); + WxMsgValidationcodeModel msgModel = new WxMsgValidationcodeModel(); msgModel.setTenantId(mailMsg.getTenantId()); - msgModel.setModelId(mailMsg.getModelId()); - WxMsgModel wxMsgModel = wxMsgModelMapper.findOneByModelId(msgModel); - if(wxMsgModel == null){ + msgModel.setType(mailMsg.getModelId()); + List modelList = wxMsgValidationcodeModelMapper.findList(msgModel); + if(CollectionUtils.isEmpty(modelList)){ throw new Exception("模板id:"+mailMsg.getModelId()+"不存在"); } + WxMsgValidationcodeModel wxMsgModel = modelList.get(0); String msg = wxMsgModel.getContent(); for (Map.Entry entry : mailMsg.getDynamicContentMap().entrySet()) { diff --git a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml index 0c6639c22..53762e162 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml @@ -10,12 +10,11 @@ - - `id`,`tenant_id`,`name`,`signature`,`content`,`createtime`,`status`,`model_id`,email_bg_img + `id`,`tenant_id`,`name`,`signature`,`content`,`createtime`,`status`,`model_id` diff --git a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml index 4d5379181..d60a70635 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml @@ -12,10 +12,12 @@ + + - `id`,`name`,`signature`,`content`,`createtime`,`status`,`minutes`,`model_id`,`type`,`tenant_id` + `id`,`name`,`signature`,`content`,`createtime`,`status`,`minutes`,`model_id`,`type`,`tenant_id`,email_bg_img