From 68343c0e409d7f02f29c5a832a6a1e24e9690f06 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 01 三月 2022 15:49:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Phase3' into Phase3
---
pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 64fb56e..75cdc22 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,7 @@
package com.pollex.pam.web.rest;
+import com.pollex.pam.aop.logging.audit.AuditLoggingInject;
+import com.pollex.pam.aop.logging.audit.AuditLoggingType;
import com.pollex.pam.domain.Appointment;
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.security.SecurityUtils;
@@ -23,6 +25,9 @@
import java.nio.charset.StandardCharsets;
import java.util.List;
+import static com.pollex.pam.aop.logging.audit.AuditLoggingType.CONSULTANT_SEND_FILL_SATISFACTION_NOTICE;
+import static com.pollex.pam.aop.logging.audit.AuditLoggingType.EDIT_CONSULTANT_DATA;
+
@RestController
@RequestMapping("/api/consultant")
public class ConsultantResource {
@@ -36,12 +41,6 @@
@GetMapping("/favorite")
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);
}
@@ -69,13 +68,13 @@
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);
@@ -118,6 +117,7 @@
return ResponseEntity.noContent().build();
}
+ @AuditLoggingInject(type = EDIT_CONSULTANT_DATA)
@PostMapping("/edit")
public ResponseEntity<Consultant> editConsultant(@RequestBody ConsultantEditDTO editDTO) {
if(!editDTO.getAgentNo().equals(SecurityUtils.getAgentNo())) {
@@ -127,6 +127,7 @@
return new ResponseEntity<>(editResult, HttpStatus.OK);
}
+ @AuditLoggingInject(type = CONSULTANT_SEND_FILL_SATISFACTION_NOTICE)
@PostMapping("/sendSatisfactionToClient/{appointmentId}")
public ResponseEntity<Void> sendSatisfactionToClient(@PathVariable Long appointmentId) {
Appointment appointment = appointmentService.findById(appointmentId);
--
Gitblit v1.8.0