From 1d8e72674b2d14270fe5c2ba6fe3be4efa28a924 Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期五, 24 十二月 2021 13:19:37 +0800
Subject: [PATCH] Merge branch 'master' of https://dev.pollex.com.tw:8443/r/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java | 49 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java
index 7924090..38592f3 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java
@@ -1,16 +1,14 @@
package com.pollex.pam.web.rest;
-import com.pollex.pam.service.ConsultantService;
+import com.pollex.pam.domain.Appointment;
+import com.pollex.pam.service.SendMsgService;
+import com.pollex.pam.service.dto.AppointmentUpdateDTO;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
-import com.pollex.pam.domain.AppointmentCustomerView;
import com.pollex.pam.service.AppointmentService;
+import com.pollex.pam.service.SatisfactionService;
import com.pollex.pam.service.dto.AppointmentCreateDTO;
import com.pollex.pam.service.dto.AppointmentCustomerViewDTO;
@@ -21,20 +19,43 @@
@Autowired
AppointmentService appointmentService;
+ @Autowired
+ SatisfactionService satisfactionService;
+
+ @Autowired
+ SendMsgService sendMsgService;
+
+ @PutMapping("")
+ public ResponseEntity<Void> updateAppointment(@RequestBody AppointmentUpdateDTO appointment) {
+ appointmentService.updateAppointment(appointment);
+ return ResponseEntity.noContent().build();
+ }
+
+ @DeleteMapping("/{appointmentId}")
+ public ResponseEntity<Void> markAppointmentDeleted(@PathVariable Long appointmentId) {
+ appointmentService.markAppointmentDeleted(appointmentId);
+ return ResponseEntity.noContent().build();
+ }
+
@PostMapping("/customer/create")
public void clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
- appointmentService.customerCreateAppointment(appointmentCreateDTO);
- }
-
+ Appointment appointment = appointmentService.customerCreateAppointment(appointmentCreateDTO);
+ sendMsgService.sendAppointmentNotify(appointment);
+ }
+
@PostMapping("/markAsContacted/{appointmentId}")
public void markAsContacted(@PathVariable Long appointmentId) {
appointmentService.markAsContacted(appointmentId);
}
-
+
@GetMapping("/getDetail/{appointmentId}")
public AppointmentCustomerViewDTO getAppointmentDetail(@PathVariable Long appointmentId) {
return appointmentService.getAppointmentDetail(appointmentId);
}
-
-
+
+ @PostMapping("/recordRead/{appointmentId}")
+ public ResponseEntity<Void> recordConsultantReadAppointment(@PathVariable Long appointmentId) {
+ appointmentService.recordConsultantReadTime(appointmentId);
+ return ResponseEntity.noContent().build();
+ }
}
--
Gitblit v1.8.0