DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

发邮件功能处理提交

Browse Source 
日志功能修复
This commit is contained in:
lixuetao
2023-12-13 13:31:00 +08:00
parent 9d85d696ca
commit 7b5606df0a
8 changed files with 238 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.java
+49
View File
@@ -1,8 +1,16 @@
package com.adc.da.wkflow.listener.powerApply;
import cn.hutool.core.util.StrUtil;
import com.adc.da.login.util.UserUtils;
import com.adc.da.report.dao.mysql.PowerApplyActDao;
import com.adc.da.report.dao.mysql.ReportDao;
import com.adc.da.report.eo.PowerApplyAct;
import com.adc.da.report.service.IReportService;
import com.adc.da.report.vo.ReportDetailVo;
import com.adc.da.sys.entity.UserEO;
import com.adc.da.sys.service.iservice.IUserEoService;
import com.adc.da.sys.util.EmailUtil;
import com.adc.da.sys.util.EncryptUtil;
import com.adc.da.wkflow.business_main.entity.BusProcessApprove;
import com.adc.da.wkflow.business_main.entity.BusProcessNew;
import com.adc.da.wkflow.business_main.service.IBusProcessApproveService;
@@ -14,6 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import javax.annotation.Resource;
import java.util.List;
/**
@@ -26,6 +35,10 @@ public class oneApplyAfter implements TaskListener {
PowerApplyActDao powerApplyActDao = SpringContextUtil.getBean(PowerApplyActDao.class);
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class);
IUserEoService userEoService = SpringContextUtil.getBean(IUserEoService.class);
EmailUtil emailUtil = SpringContextUtil.getBean(EmailUtil.class);
ReportDao reportDao = SpringContextUtil.getBean(ReportDao.class);
//查询task任务
LambdaQueryWrapper<PowerApplyAct> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId());
@@ -59,5 +72,41 @@ public class oneApplyAfter implements TaskListener {
//审批人
delegateTask.setVariable("oneApprove",object.getString("oneApprove"));
delegateTask.setVariable("twoApprove",object.getString("twoApprove"));
try {
if (StrUtil.isNotEmpty(powerApplyAct.getUserId())){
UserEO userEO = userEoService.getUserById(powerApplyAct.getUserId());
if (userEO != null && StrUtil.isNotEmpty(userEO.getEmail())){
// 给email解码
String email = EncryptUtil.decrypt(userEO.getEmail()).toString();
// 获取文件信息
String reportId = powerApplyAct.getReportId();
ReportDetailVo reportDetailVo = reportDao.reportDetail(reportId);
String approveOption = "";
if ("1".equals(s)){
approveOption = "通过";
} else {
approveOption = "不通过";
}
String title = reportDetailVo.getName() + "文件权限申请一级审批" + approveOption;
String powerStr = "";
if(powerApplyAct.getPower() == 1){
powerStr = "预览";
} else if(powerApplyAct.getPower() == 2){
powerStr = "预览+下载";
}
String content = reportDetailVo.getName() + "文件" + powerStr + "权限申请一级审批完成，审核结果：" + approveOption + "。";
// 发邮件给发起人
emailUtil.sendSimpleMail(email, title, content);
}
}
} catch (Exception e) {
e.printStackTrace();
}
}
}
report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.java
+49
View File
@@ -1,9 +1,16 @@
package com.adc.da.wkflow.listener.powerApply;
import cn.hutool.core.util.StrUtil;
import com.adc.da.login.util.UserUtils;
import com.adc.da.report.dao.mysql.PowerApplyActDao;
import com.adc.da.report.dao.mysql.PowerApplyDao;
import com.adc.da.report.dao.mysql.ReportDao;
import com.adc.da.report.eo.PowerApplyAct;
import com.adc.da.report.vo.ReportDetailVo;
import com.adc.da.sys.entity.UserEO;
import com.adc.da.sys.service.iservice.IUserEoService;
import com.adc.da.sys.util.EmailUtil;
import com.adc.da.sys.util.EncryptUtil;
import com.adc.da.wkflow.business_main.entity.BusProcessApprove;
import com.adc.da.wkflow.business_main.entity.BusProcessNew;
import com.adc.da.wkflow.business_main.service.IBusProcessApproveService;
@@ -16,6 +23,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.TaskListener;
import javax.annotation.Resource;
import java.util.List;
/**
@@ -23,6 +31,7 @@ import java.util.List;
*/
public class twoApplyAfter implements TaskListener {
@Override
public void notify(DelegateTask delegateTask) {
PowerApplyActDao powerApplyActDao = SpringContextUtil.getBean(PowerApplyActDao.class);
@@ -30,6 +39,10 @@ public class twoApplyAfter implements TaskListener {
IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class);
IUserEoService userEoService = SpringContextUtil.getBean(IUserEoService.class);
EmailUtil emailUtil = SpringContextUtil.getBean(EmailUtil.class);
ReportDao reportDao = SpringContextUtil.getBean(ReportDao.class);
//查询task任务
LambdaQueryWrapper<PowerApplyAct> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId());
@@ -65,5 +78,41 @@ public class twoApplyAfter implements TaskListener {
powerApplyDao.savePowerAct(powerApplyAct);
busProcessNameService.stopAct(delegateTask.getProcessInstanceId());
}
try {
if (StrUtil.isNotEmpty(powerApplyAct.getUserId())){
UserEO userEO = userEoService.getUserById(powerApplyAct.getUserId());
if (userEO != null && StrUtil.isNotEmpty(userEO.getEmail())){
// 给email解码
String email = EncryptUtil.decrypt(userEO.getEmail()).toString();
// 获取文件信息
String reportId = powerApplyAct.getReportId();
ReportDetailVo reportDetailVo = reportDao.reportDetail(reportId);
String approveOption = "";
if ("1".equals(s)){
approveOption = "通过";
} else {
approveOption = "不通过";
}
String title = reportDetailVo.getName() + "文件权限申请二级审批" + approveOption;
String powerStr = "";
if(powerApplyAct.getPower() == 1){
powerStr = "预览";
} else if(powerApplyAct.getPower() == 2){
powerStr = "预览+下载";
}
String content = reportDetailVo.getName() + "文件" + powerStr + "权限申请二级审批完成，审核结果：" + approveOption + "。";
// 发邮件给发起人
emailUtil.sendSimpleMail(email, title, content);
}
}
} catch (Exception e) {
e.printStackTrace();
}
}
}