From db15612798841319bafcb3ed4e77c7c013b9446f Mon Sep 17 00:00:00 2001 From: jack <jack.su@pollex.com.tw> Date: 星期三, 25 十二月 2024 15:39:30 +0800 Subject: [PATCH] [UPDATE] 新增顧問登入OTP流程和文件 --- pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java | 39 +++++++++++++-------------------------- 1 files changed, 13 insertions(+), 26 deletions(-) diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java index 3af2eaf..7c8bc6f 100644 --- a/pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java +++ b/pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java @@ -1,27 +1,23 @@ package com.pollex.pam.web.rest; -import com.pollex.pam.domain.Appointment; -import com.pollex.pam.domain.Consultant; -import com.pollex.pam.security.SecurityUtils; -import com.pollex.pam.service.AppointmentService; -import com.pollex.pam.service.ConsultantService; -import com.pollex.pam.service.dto.*; +import com.pollex.pam.business.aop.logging.audit.AuditLoggingInject; +import com.pollex.pam.business.domain.Consultant; +import com.pollex.pam.business.security.SecurityUtils; +import com.pollex.pam.business.service.AppointmentService; +import com.pollex.pam.business.service.ConsultantService; +import com.pollex.pam.business.service.dto.*; import org.apache.commons.compress.utils.IOUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.io.ClassPathResource; -import org.springframework.core.io.Resource; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.nio.charset.StandardCharsets; import java.util.List; + +import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.EDIT_CONSULTANT_DATA; @RestController @RequestMapping("/api/consultant") @@ -29,7 +25,7 @@ @Autowired ConsultantService consultantService; - + @Autowired AppointmentService appointmentService; @@ -102,8 +98,8 @@ }else { return new ResponseEntity<>(HttpStatus.NOT_FOUND); } - - + + } @PostMapping("/record/allAppointmentsView") @@ -111,7 +107,8 @@ consultantService.recordAllAppointmentsView(); return ResponseEntity.noContent().build(); } - + + @AuditLoggingInject(type = EDIT_CONSULTANT_DATA) @PostMapping("/edit") public ResponseEntity<Consultant> editConsultant(@RequestBody ConsultantEditDTO editDTO) { if(!editDTO.getAgentNo().equals(SecurityUtils.getAgentNo())) { @@ -119,15 +116,5 @@ } Consultant editResult = consultantService.editConsultant(editDTO); return new ResponseEntity<>(editResult, HttpStatus.OK); - } - - @PostMapping("/sendSatisfactionToClient/{appointmentId}") - public ResponseEntity<Void> sendSatisfactionToClient(@PathVariable Long appointmentId) { - Appointment appointment = appointmentService.findById(appointmentId); - if(!appointment.getAgentNo().equals(SecurityUtils.getAgentNo())) { - throw new IllegalAccessError(); - } - consultantService.sendSatisfactionToClient(appointment); - return ResponseEntity.noContent().build(); } } -- Gitblit v1.8.0