From e42dde72c5cd6ca57d6fa720a17fa4bc229c42cd Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 08 二月 2022 14:06:36 +0800
Subject: [PATCH] [update] 修正填寫滿意度的規格，並修正appointmentId現在不為唯一導致有搜尋的問題
---
pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java | 92 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 76 insertions(+), 16 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 0323979..64fb56e 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,8 +1,13 @@
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 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;
@@ -10,25 +15,40 @@
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;
@RestController
@RequestMapping("/api/consultant")
public class ConsultantResource {
- private final ConsultantService consultantService;
+ @Autowired
+ ConsultantService consultantService;
- public ConsultantResource(ConsultantService consultantService) {
- this.consultantService = consultantService;
- }
+ @Autowired
+ AppointmentService appointmentService;
@GetMapping("/favorite")
- public ResponseEntity<List<ConsultantDTO>> getMyConsultantList() {
- List<ConsultantDTO> myConsultants = consultantService.getMyConsultantList();
+ public ResponseEntity<List<CustomerFavoriteConsultantDTO>> getMyConsultantList() {
+ List<CustomerFavoriteConsultantDTO> myConsultants = consultantService.getMyConsultantList();
return new ResponseEntity<>(myConsultants, HttpStatus.OK);
+ }
+
+ @GetMapping("/all")
+ public ResponseEntity<List<ConsultantDTO>> getAllConsultantList() {
+ List<ConsultantDTO> myConsultants = consultantService.getAllConsultantList();
+ return new ResponseEntity<>(myConsultants, HttpStatus.OK);
+ }
+
+ @PostMapping("/favorite/view")
+ public ResponseEntity<Void> recordMyConsultantListView() {
+ consultantService.recordMyConsultantListView();
+ return ResponseEntity.noContent().build();
}
@GetMapping("/recommend")
@@ -43,12 +63,19 @@
return new ResponseEntity<>(HttpStatus.ACCEPTED);
}
+ @DeleteMapping("/favorite/{agentNo}")
+ public ResponseEntity<Void> removeConsultantFromCustomList(@PathVariable String agentNo) {
+ consultantService.removeConsultantFromCustomList(agentNo);
+ return new ResponseEntity<>(HttpStatus.OK);
+ }
+
+ @Deprecated
@PostMapping("/strictQuery")
public ResponseEntity<List<ConsultantDTO>> strictQueryConsultant(@RequestBody StrictQueryConsultantParam param) {
List<ConsultantDTO> queryResult = consultantService.strictQueryConsultant(param);
return new ResponseEntity<>(queryResult, HttpStatus.OK);
}
-
+ @Deprecated
@PostMapping("/fastQuery")
public ResponseEntity<List<ConsultantDTO>> fastQueryConsultant(@RequestBody FastQueryConsultantParam param) {
List<ConsultantDTO> queryResult = consultantService.fastQueryConsultant(param);
@@ -66,14 +93,47 @@
return consultantService.getMyAppointment();
}
- @GetMapping(value = "/avatar/{fileName}", produces = MediaType.IMAGE_JPEG_VALUE)
- public ResponseEntity<byte[]> getAvatarImage(@PathVariable String fileName) throws IOException {
- try {
- Resource resource = new ClassPathResource("static/consultant/" + fileName);
- InputStream in = resource.getInputStream();
- return new ResponseEntity<>(IOUtils.toByteArray(in), HttpStatus.OK);
- } catch (FileNotFoundException e) {
- return new ResponseEntity<>(HttpStatus.NOT_FOUND);
- }
+ @GetMapping(value = "/avatar/{agentNo}", produces = MediaType.IMAGE_JPEG_VALUE)
+ public ResponseEntity<byte[]> getAvatarImage(@PathVariable String agentNo) throws IOException {
+// try {
+// Resource resource = new ClassPathResource("static/consultant/" + fileName);
+// InputStream in = resource.getInputStream();
+// return new ResponseEntity<>(IOUtils.toByteArray(in), HttpStatus.OK);
+// } catch (FileNotFoundException e) {
+// return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+// }
+ InputStream in = consultantService.getAvatarImage(agentNo);
+ if(in!=null) {
+ return new ResponseEntity<>(IOUtils.toByteArray(in), HttpStatus.OK);
+ }else {
+ return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+ }
+
+
+ }
+
+ @PostMapping("/record/allAppointmentsView")
+ public ResponseEntity<Void> recordAllAppointmentsView() {
+ consultantService.recordAllAppointmentsView();
+ return ResponseEntity.noContent().build();
+ }
+
+ @PostMapping("/edit")
+ public ResponseEntity<Consultant> editConsultant(@RequestBody ConsultantEditDTO editDTO) {
+ if(!editDTO.getAgentNo().equals(SecurityUtils.getAgentNo())) {
+ throw new IllegalAccessError();
+ }
+ 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