From 6fa4bba623713c396432ba8b863846883d6a1906 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 26 一月 2022 10:52:23 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 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 e6e74d2..3af2eaf 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,5 +1,9 @@
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;
@@ -11,9 +15,12 @@
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
@@ -22,6 +29,9 @@
@Autowired
ConsultantService consultantService;
+
+ @Autowired
+ AppointmentService appointmentService;
@GetMapping("/favorite")
public ResponseEntity<List<CustomerFavoriteConsultantDTO>> getMyConsultantList() {
@@ -77,15 +87,23 @@
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")
@@ -93,4 +111,23 @@
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