From 242fad1691917c4fd82c7f04b6190a7113628e93 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 11 三月 2022 15:31:04 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java | 116 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 67 insertions(+), 49 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 dd2fc14..5164e6a 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,24 +1,24 @@
package com.pollex.pam.web.rest;
-import com.pollex.pam.appointment.process.AppointmentProcess;
-import com.pollex.pam.domain.Appointment;
-import com.pollex.pam.enums.ContactStatusEnum;
-import com.pollex.pam.service.SendMsgService;
-import com.pollex.pam.service.dto.AppointmentUpdateDTO;
-import com.pollex.pam.service.dto.ClosedProcessDTO;
-import com.pollex.pam.service.dto.DoneProcessDTO;
+import com.pollex.pam.business.aop.logging.audit.AuditLoggingInject;
+import com.pollex.pam.business.aop.logging.audit.AuditLoggingType;
+import com.pollex.pam.business.appointment.process.AppointmentProcess;
+import com.pollex.pam.business.domain.Appointment;
+import com.pollex.pam.business.security.SecurityUtils;
+import com.pollex.pam.business.service.SendMsgService;
-import org.springframework.beans.BeanUtils;
+import com.pollex.pam.business.service.dto.*;
+import com.pollex.pam.business.service.mapper.AppointmentMapper;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import com.pollex.pam.service.AppointmentService;
-import com.pollex.pam.service.SatisfactionService;
-import com.pollex.pam.service.dto.AppointmentCloseDTO;
-import com.pollex.pam.service.dto.AppointmentCreateDTO;
-import com.pollex.pam.service.dto.AppointmentCustomerViewDTO;
+import com.pollex.pam.business.service.AppointmentService;
+import com.pollex.pam.business.service.PersonalNotificationService;
+import com.pollex.pam.business.service.SatisfactionService;
+
+import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.*;
@RestController
@RequestMapping("/api/appointment")
@@ -27,31 +27,44 @@
@Autowired
AppointmentService appointmentService;
+ @Autowired
+ AppointmentMapper appointmentMapper;
+
@Autowired
SatisfactionService satisfactionService;
@Autowired
SendMsgService sendMsgService;
-
+
@Autowired
AppointmentProcess abstractAppointmentProcess;
+ @Autowired
+ PersonalNotificationService personalNotificationService;
+
+ @AuditLoggingInject(type = CUSTOMER_EDIT_APPOINTMENT)
@PutMapping("")
- public ResponseEntity<Void> updateAppointment(@RequestBody AppointmentUpdateDTO appointment) {
- appointmentService.updateAppointment(appointment);
+ public ResponseEntity<Void> updateAppointment(@RequestBody AppointmentUpdateDTO dto) {
+ Appointment appointment = appointmentService.updateAppointment(dto);
+ personalNotificationService.createUpdateAppointmentToConsultant(appointment);
return ResponseEntity.noContent().build();
}
+ @AuditLoggingInject(type = AuditLoggingType.CUSTOMER_CANCEL_APPOINTMENT)
@DeleteMapping("/{appointmentId}")
public ResponseEntity<Void> markAppointmentDeleted(@PathVariable Long appointmentId) {
appointmentService.markAppointmentDeleted(appointmentId);
return ResponseEntity.noContent().build();
}
+ @AuditLoggingInject(type = AuditLoggingType.CUSTOMER_CREATE_APPOINTMENT)
@PostMapping("/customer/create")
- public void clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
+ public AppointmentDTO clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
Appointment appointment = appointmentService.customerCreateAppointment(appointmentCreateDTO);
appointmentService.sendAppointmentNotify(appointment);
+ satisfactionService.createUnfilledSystemSatisfaction(appointment);
+
+ return appointmentMapper.toAppointmentDTO(appointment);
}
@PostMapping("/markAsContacted/{appointmentId}")
@@ -60,50 +73,55 @@
return appointmentService.getAppointmentDetail(appointmentId);
}
+ @AuditLoggingInject(type = CHECK_APPOINTMENT)
@GetMapping("/getDetail/{appointmentId}")
public AppointmentCustomerViewDTO getAppointmentDetail(@PathVariable Long appointmentId) {
return appointmentService.getAppointmentDetail(appointmentId);
}
+ @AuditLoggingInject(type = CONSULTANT_READ_APPOINTMENT)
@PostMapping("/recordRead/{appointmentId}")
public ResponseEntity<Void> recordConsultantReadAppointment(@PathVariable Long appointmentId) {
appointmentService.recordConsultantReadTime(appointmentId);
return ResponseEntity.noContent().build();
}
-
+
+ @AuditLoggingInject(type = APPOINTMENT_CLOSE)
@PostMapping("/close")
public ResponseEntity<Void> closeAppointment(@RequestBody AppointmentCloseDTO closeDTO) {
-
- if(closeDTO.getContactStatus() == ContactStatusEnum.DONE) {
- DoneProcessDTO dto = new DoneProcessDTO();
- BeanUtils.copyProperties(closeDTO, dto);
- abstractAppointmentProcess.process(dto);
- }else if(closeDTO.getContactStatus() == ContactStatusEnum.CLOSED){
- ClosedProcessDTO dto = new ClosedProcessDTO();
- BeanUtils.copyProperties(closeDTO, dto);
- abstractAppointmentProcess.process(dto);
- }else {
- return ResponseEntity.notFound().build();
- }
-
+ appointmentService.closeAppointment(closeDTO);
return ResponseEntity.noContent().build();
}
-
- @PostMapping("/close/info/edit")
- public ResponseEntity<Void> editAppointmentClosedInfo(@RequestBody AppointmentCloseDTO closeDTO) {
-
- if(closeDTO.getContactStatus() == ContactStatusEnum.DONE) {
- DoneProcessDTO dto = new DoneProcessDTO();
- BeanUtils.copyProperties(closeDTO, dto);
- abstractAppointmentProcess.editClosedInfo(dto);
- }else if(closeDTO.getContactStatus() == ContactStatusEnum.CLOSED){
- ClosedProcessDTO dto = new ClosedProcessDTO();
- BeanUtils.copyProperties(closeDTO, dto);
- abstractAppointmentProcess.editClosedInfo(dto);
- }else {
- return ResponseEntity.notFound().build();
- }
-
- return ResponseEntity.noContent().build();
+
+ @GetMapping("/customer/expiring/newest")
+ public ResponseEntity<AppointmentCustomerViewDTO> getNewestExpiringAppointment() {
+ Long customerId = SecurityUtils.getCustomerDBId();
+ AppointmentCustomerViewDTO customerNewestExpiringAppointment = appointmentService.getCustomerNewestExpiringAppointment(customerId);
+
+ return new ResponseEntity<>(customerNewestExpiringAppointment, HttpStatus.OK);
}
+
+ @GetMapping("/consultant/pending/sum")
+ public ResponseEntity<Long> getConsultantPendingAppointmentSum() {
+ String agentNo = SecurityUtils.getAgentNo();
+ return new ResponseEntity<>(appointmentService.getConsultantPendingAppointmentSum(agentNo), HttpStatus.OK);
+ }
+
+// @PostMapping("/close/info/edit")
+// public ResponseEntity<Void> editAppointmentClosedInfo(@RequestBody AppointmentCloseDTO closeDTO) {
+//
+// if(closeDTO.getContactStatus() == ContactStatusEnum.DONE) {
+// DoneProcessDTO dto = new DoneProcessDTO();
+// BeanUtils.copyProperties(closeDTO, dto);
+// abstractAppointmentProcess.editClosedInfo(dto);
+// }else if(closeDTO.getContactStatus() == ContactStatusEnum.CLOSED){
+// ClosedProcessDTO dto = new ClosedProcessDTO();
+// BeanUtils.copyProperties(closeDTO, dto);
+// abstractAppointmentProcess.editClosedInfo(dto);
+// }else {
+// return ResponseEntity.notFound().build();
+// }
+//
+// return ResponseEntity.noContent().build();
+// }
}
--
Gitblit v1.8.0