From bdae23a40c461c2c6b6ee614f661eac731c949c8 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期三, 22 十二月 2021 14:12:05 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java
index c9ff370..461ea06 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java
@@ -1,6 +1,8 @@
package com.pollex.pam.web.rest;
+import com.pollex.pam.repository.AppointmentRepository;
import com.pollex.pam.service.SendMsgService;
+import com.pollex.pam.service.dto.SendSMSResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -13,21 +15,35 @@
@Autowired
SendMsgService sendMsgService;
+ @Autowired
+ AppointmentRepository appointmentRepository;
+
@GetMapping("/bySMS")
- public ResponseEntity<Void> bySMS(@RequestParam String toMobile, @RequestParam String content) {
- sendMsgService.sendMsgBySMS(toMobile, content);
- return ResponseEntity.noContent().build();
+ public ResponseEntity<SendSMSResponse> bySMS(@RequestParam String toMobile, @RequestParam String content) {
+ return ResponseEntity.ok(sendMsgService.sendMsgBySMS(toMobile, content));
}
@GetMapping("/byEmail")
- public ResponseEntity<Void> byEmail(
+ public ResponseEntity<String> byEmail(
@RequestParam String from,
@RequestParam String to,
@RequestParam String subject,
@RequestParam String content,
@RequestParam boolean htmlFormat
) {
- sendMsgService.sendMsgByEmail(from, to, subject, content, htmlFormat);
- return ResponseEntity.noContent().build();
+ return ResponseEntity.ok(sendMsgService.sendMsgByEmail(from, to, subject, content, htmlFormat));
+ }
+
+ @GetMapping("/byHtmlEmail")
+ public ResponseEntity<String> byHtmlEmail(
+ @RequestParam String from,
+ @RequestParam String to
+ ) {
+ return ResponseEntity.ok(sendMsgService.sendMsgByHtmlTestTemplateEmail(from, to));
+ }
+
+ @GetMapping("/appointment/{appointmentId}")
+ public void sendAppointmentNotify(@PathVariable Long appointmentId) {
+ sendMsgService.sendAppointmentNotify(appointmentRepository.findById(appointmentId).get());
}
}
--
Gitblit v1.8.0