From e828225de7636d0195db2c3c9b1701a5b2f12049 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期四, 14 九月 2023 18:01:33 +0800
Subject: [PATCH] Merge branch '滲透' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into 滲透
---
pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java | 78 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 10 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 eb20daf..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,44 @@
package com.pollex.pam.web.rest;
-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.http.HttpStatus;
+import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.List;
+
+import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.EDIT_CONSULTANT_DATA;
@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);
+ }
+
+ @PostMapping("/favorite/view")
+ public ResponseEntity<Void> recordMyConsultantListView() {
+ consultantService.recordMyConsultantListView();
+ return ResponseEntity.noContent().build();
}
@GetMapping("/recommend")
@@ -35,6 +52,13 @@
consultantService.addConsultantToCustomList(param);
return new ResponseEntity<>(HttpStatus.ACCEPTED);
}
+
+ @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) {
@@ -53,10 +77,44 @@
ConsultantDetailDTO result = consultantService.getConsultantDetail(agentNo);
return new ResponseEntity<>(result, HttpStatus.OK);
}
-
+
@GetMapping("/getMyAppointment")
public List<AppointmentCustomerViewDTO> getMyAppointment() {
return consultantService.getMyAppointment();
}
-
+
+ @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();
+ }
+
+ @AuditLoggingInject(type = EDIT_CONSULTANT_DATA)
+ @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);
+ }
}
--
Gitblit v1.8.0