Procházet zdrojové kódy

refactor(pssr): 移除冗余代码并简化邮件发送逻辑

- 删除未使用的导入类和相关服务引用
- 简化邮件模板替换逻辑,移除多余的字符串替换操作- 移除邮件标题中的工单号显示
- 清理无用的日志输出和变量声明
jiangbiao před 2 měsíci
rodič
revize
13763137a9

+ 2 - 15
master/src/main/java/com/ruoyi/project/listener/pssr/ConfirmTaskCreateListener.java

@@ -6,12 +6,6 @@ import com.github.stuxuhai.jpinyin.PinyinHelper;
 import com.ruoyi.common.jpush.JiGuangPushService;
 import com.ruoyi.common.sendEmail.IMailService;
 import com.ruoyi.common.utils.SpringContextUtils;
-import com.ruoyi.project.invoice.domain.TApproveReserveInvoice;
-import com.ruoyi.project.invoice.domain.TInvoiceBookingworkticket;
-import com.ruoyi.project.invoice.service.ITApproveReserveInvoiceService;
-import com.ruoyi.project.invoice.service.ITInvoiceBookingworkticketService;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.service.ITPssrApproveService;
 import com.ruoyi.project.system.domain.SysMessage;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysMessageService;
@@ -31,21 +25,16 @@ public class ConfirmTaskCreateListener implements Serializable, TaskListener {
 
     @Override
     public void notify(DelegateTask delegateTask) {
-        String id = delegateTask.getExecution().getProcessInstanceBusinessKey();
-        ITPssrApproveService approveService = (ITPssrApproveService) SpringContextUtils.getBean("tPssrApproveService");
         ISysMessageService sysMessageService = (ISysMessageService) SpringContextUtils.getBean("sysMessageService");
         ISysUserService sysUserService = (ISysUserService) SpringContextUtils.getBean("sysUserService");
         JiGuangPushService jiGuangPushService = (JiGuangPushService) SpringContextUtils.getBean("jiGuangPushService");
         IMailService mailService = (IMailService) SpringContextUtils.getBean("mailService");
-        TPssrApprove approveEntity = approveService.selectTPssrApproveById(Long.parseLong(id));
         String assignee = delegateTask.getAssignee();
 
         logger.info("==============================发邮件============================");
         //发送邮件
         try {
             String email = sysUserService.selectUserById(Long.parseLong(assignee)).getEmail();
-            String apNo = approveEntity.getApNo();
-            logger.info("apNo:" + apNo);
             SysUser sysUser = sysUserService.selectUserById(Long.parseLong(assignee));
             String username = sysUser.getNickName();
             String loginName = sysUser.getUserName();
@@ -76,16 +65,14 @@ public class ConfirmTaskCreateListener implements Serializable, TaskListener {
             String one = center.replaceFirst("username", username);
             String two = one.replaceFirst("usernameEN", usernameEN);
             String three = two.replace("loginName", loginName);
-            String four = three.replaceFirst("apNo", apNo);
-            String five = four.replaceFirst("apNoEN", apNo);
-            String result = five.replaceFirst("date", String.valueOf(new Date()));
+            String result = three.replaceFirst("date", String.valueOf(new Date()));
             prime = prime + result;
             //写html结尾内容
             String end = "</tbody></table></div></body></html>";
             //拼接html
             String html = start + prime + end;
             logger.info("html:" + html);
-            mailService.sendHtmlMail(email, "PSSR:您有一个新的待办任务 PSSR:You have a pending PSSR task (" + apNo + ")", html);
+            mailService.sendHtmlMail(email, "PSSR:您有一个新的待办任务 PSSR:You have a pending PSSR task ", html);
 
         } catch (Exception e) {
             logger.error("邮件发送失败" + JSON.toJSONString(e));