From 56b8aa40e7e73b92f983a2c6ee0f87adbe2b4731 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 25 十一月 2021 10:26:49 +0800
Subject: [PATCH] [fix] 修正OtpResource 在 git merge時導致的錯誤
---
pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 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 4b1193d..94bd26d 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
@@ -2,10 +2,17 @@
import com.pollex.pam.service.ConsultantService;
import com.pollex.pam.service.dto.*;
+import org.apache.commons.compress.utils.IOUtils;
+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.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.List;
@RestController
@@ -36,21 +43,44 @@
return new ResponseEntity<>(HttpStatus.ACCEPTED);
}
- @GetMapping("/strictQuery")
+ @DeleteMapping("/favorite/{agentNo}")
+ public ResponseEntity<Void> removeConsultantFromCustomList(@PathVariable String agentNo) {
+ consultantService.removeConsultantFromCustomList(agentNo);
+ return new ResponseEntity<>(HttpStatus.OK);
+ }
+
+
+ @PostMapping("/strictQuery")
public ResponseEntity<List<ConsultantDTO>> strictQueryConsultant(@RequestBody StrictQueryConsultantParam param) {
List<ConsultantDTO> queryResult = consultantService.strictQueryConsultant(param);
return new ResponseEntity<>(queryResult, HttpStatus.OK);
}
- @GetMapping("/fastQuery")
+ @PostMapping("/fastQuery")
public ResponseEntity<List<ConsultantDTO>> fastQueryConsultant(@RequestBody FastQueryConsultantParam param) {
List<ConsultantDTO> queryResult = consultantService.fastQueryConsultant(param);
return new ResponseEntity<>(queryResult, HttpStatus.OK);
}
- @GetMapping("/{agentNo}")
- public ResponseEntity<ConsultantDetailDTO> getConsultantDetail(@PathVariable String agentNo) {
+ @GetMapping("/detail")
+ public ResponseEntity<ConsultantDetailDTO> getConsultantDetail(@RequestParam("agentNo") String agentNo) {
ConsultantDetailDTO result = consultantService.getConsultantDetail(agentNo);
return new ResponseEntity<>(result, HttpStatus.OK);
}
+
+ @GetMapping("/getMyAppointment")
+ public List<AppointmentCustomerViewDTO> getMyAppointment() {
+ 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);
+ }
+ }
}
--
Gitblit v1.8.0