Просмотр исходного кода

[消息][修改][迁移模板数据]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
ccdbe4fb59
6 измененных файлов: 32 добавлений и 18 удалений
  1. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V201905061431__L_VAL_MSG_MODEL_DATA_DEL.sql
  2. +0
    -9
      mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java
  3. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMsgValidationcodeModel.java
  4. +15
    -6
      mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java
  5. +1
    -2
      mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml
  6. +3
    -1
      mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml

+ 2
- 0
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;

+ 0
- 9
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") @io.swagger.annotations.ApiModelProperty(value="modelid",name="modelId")
private Integer modelId; private Integer modelId;
private String emailBgImg;

public String getEmailBgImg() {
return emailBgImg;
}

public void setEmailBgImg(String emailBgImg) {
this.emailBgImg = emailBgImg;
}


public String getTenantId() { public String getTenantId() {
return tenantId; return tenantId;


+ 11
- 0
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") @io.swagger.annotations.ApiModelProperty(value="tenantid",name="tenantId")
private String 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() { public String getName() {
return name; return name;
} }


+ 15
- 6
mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java Просмотреть файл

@@ -1,10 +1,15 @@
package com.iformall.service.msg.impl; 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.BaseMsg;
import com.iformall.domain.po.msg.MailMsg; import com.iformall.domain.po.msg.MailMsg;
import com.iformall.domain.po.WxMsgModel; import com.iformall.domain.po.WxMsgModel;
import com.iformall.mapper.WxMsgModelMapper; import com.iformall.mapper.WxMsgModelMapper;
import com.iformall.mapper.WxMsgValidationcodeMapper;
import com.iformall.mapper.WxMsgValidationcodeModelMapper;
import com.iformall.service.msg.MsgSendService; import com.iformall.service.msg.MsgSendService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -15,8 +20,11 @@ import org.springframework.mail.SimpleMailMessage;
import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.w3c.dom.stylesheets.LinkStyle;

import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMessage;
import java.io.File; import java.io.File;
import java.util.List;
import java.util.Map; import java.util.Map;


/** /**
@@ -30,25 +38,26 @@ public class SendEmailServiceImpl implements MsgSendService {


@Autowired @Autowired
private JavaMailSender sender; private JavaMailSender sender;

@Value("${spring.mail.username}") @Value("${spring.mail.username}")
private String from; private String from;

@Autowired @Autowired
private WxMsgModelMapper wxMsgModelMapper; private WxMsgModelMapper wxMsgModelMapper;
@Autowired
private WxMsgValidationcodeModelMapper wxMsgValidationcodeModelMapper;


@Override @Override
public void send(BaseMsg baseMsg) throws Exception{ public void send(BaseMsg baseMsg) throws Exception{
MailMsg mailMsg = (MailMsg)baseMsg; MailMsg mailMsg = (MailMsg)baseMsg;
//根据模板替换动态内容 //根据模板替换动态内容
if(mailMsg.getModelId() != null){ if(mailMsg.getModelId() != null){
WxMsgModel msgModel = new WxMsgModel();
WxMsgValidationcodeModel msgModel = new WxMsgValidationcodeModel();
msgModel.setTenantId(mailMsg.getTenantId()); msgModel.setTenantId(mailMsg.getTenantId());
msgModel.setModelId(mailMsg.getModelId());
WxMsgModel wxMsgModel = wxMsgModelMapper.findOneByModelId(msgModel);
if(wxMsgModel == null){
msgModel.setType(mailMsg.getModelId());
List<WxMsgValidationcodeModel> modelList = wxMsgValidationcodeModelMapper.findList(msgModel);
if(CollectionUtils.isEmpty(modelList)){
throw new Exception("模板id:"+mailMsg.getModelId()+"不存在"); throw new Exception("模板id:"+mailMsg.getModelId()+"不存在");
} }
WxMsgValidationcodeModel wxMsgModel = modelList.get(0);


String msg = wxMsgModel.getContent(); String msg = wxMsgModel.getContent();
for (Map.Entry<String, String> entry : mailMsg.getDynamicContentMap().entrySet()) { for (Map.Entry<String, String> entry : mailMsg.getDynamicContentMap().entrySet()) {


+ 1
- 2
mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml Просмотреть файл

@@ -10,12 +10,11 @@
<result column="createtime" jdbcType="TIMESTAMP" property="createtime" /> <result column="createtime" jdbcType="TIMESTAMP" property="createtime" />
<result column="status" jdbcType="INTEGER" property="status" /> <result column="status" jdbcType="INTEGER" property="status" />
<result column="model_id" jdbcType="INTEGER" property="modelId" /> <result column="model_id" jdbcType="INTEGER" property="modelId" />
<result column="email_bg_img" property="emailBgImg" />


</resultMap> </resultMap>
<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`name`,`signature`,`content`,`createtime`,`status`,`model_id`,email_bg_img
`id`,`tenant_id`,`name`,`signature`,`content`,`createtime`,`status`,`model_id`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">


+ 3
- 1
mallinkService/src/main/resources/mapper/WxMsgValidationcodeModelMapper.xml Просмотреть файл

@@ -12,10 +12,12 @@
<result column="model_id" jdbcType="INTEGER" property="modelId" /> <result column="model_id" jdbcType="INTEGER" property="modelId" />
<result column="type" jdbcType="INTEGER" property="type" /> <result column="type" jdbcType="INTEGER" property="type" />
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" />
<result column="email_bg_img" property="emailBgImg" />

</resultMap> </resultMap>
<sql id="allColumns"> <sql id="allColumns">
`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
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">


Загрузка…
Отмена
Сохранить