PSSR推送及界面功能优化

master/src/main/java/com/ruoyi/project/listener/pssr/ConfirmTaskCreateListener.java

@@ -12,7 +12,9 @@ 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;
 import com.ruoyi.project.system.service.ISysUserService;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
@@ -31,6 +33,7 @@ public class ConfirmTaskCreateListener implements Serializable, TaskListener {
     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");
@@ -83,9 +86,23 @@ public class ConfirmTaskCreateListener implements Serializable, TaskListener {
             String html = start + prime + end;
             logger.info("html:" + html);
             mailService.sendHtmlMail(email, "PSSR：您有一个新的待办任务 PSSR:You have a pending PSSR task (" + apNo + ")", html);
-            jiGuangPushService.send("PSSR审批", "您有一个新的待办任务，请及时处理。", assignee);
+
         } catch (Exception e) {
             logger.error("邮件发送失败" + JSON.toJSONString(e));
         }
+        try {
+            //极光推送
+            jiGuangPushService.send("PSSR审批", "您有一个新的待办任务，请及时处理。", assignee);
+
+            //系统消息推送
+            SysMessage sysMessage = new SysMessage();
+            sysMessage.setMsgTitle("PSSR审批");
+            sysMessage.setMsgContent("您有一个新的待办任务，请及时处理。");
+            sysMessage.setUserId(Long.parseLong(assignee));
+            sysMessageService.insertSysMessage(sysMessage);
+        } catch (Exception e) {
+            logger.error("推送失败：{}" , JSON.toJSONString(e));
+        }
+
     }
 }

master/src/main/java/com/ruoyi/project/system/service/impl/SysMessageServiceImpl.java

@@ -14,7 +14,7 @@ import com.ruoyi.project.system.service.ISysMessageService;
  * @author ruoyi
  * @date 2022-05-26
  */
-@Service
+@Service("sysMessageService")
 public class SysMessageServiceImpl implements ISysMessageService
 {
     @Autowired

ui/src/views/pssr/programme/index.vue

@@ -736,14 +736,15 @@ export default {
     },
     // 文件下载处理
     handleDownload(row) {
-      var name = row.fileName;
-      var url = row.fileUrl;
-      var suffix = url.substring(url.lastIndexOf("."), url.length);
-      const a = document.createElement('a')
-      a.setAttribute('download', name)
-      a.setAttribute('target', '_blank')
-      a.setAttribute('href', process.env.VUE_APP_BASE_API + url)
-      a.click()
+      // var name = row.fileName;
+      // var url = row.fileUrl;
+      // var suffix = url.substring(url.lastIndexOf("."), url.length);
+      // const a = document.createElement('a')
+      // a.setAttribute('download', name)
+      // a.setAttribute('target', '_blank')
+      // a.setAttribute('href', process.env.VUE_APP_BASE_API + url)
+      // a.click()
+      window.open(process.env.VUE_APP_BASE_API + row.fileUrl);
     },
     openPdf() {
       window.open(this.pdf.pdfUrl);//path是文件的全路径地址