From 472fd20c108714b28be49d4fedee5bbabe1b2358 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 04 三月 2022 17:40:47 +0800
Subject: [PATCH] Merge branch 'Phase3' into pollex-dev
---
pamapi/src/main/java/com/pollex/pam/web/rest/ConsultantResource.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 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 d80947c..5a3cc86 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,25 +1,25 @@
package com.pollex.pam.web.rest;
-import com.pollex.pam.domain.Consultant;
-import com.pollex.pam.security.SecurityUtils;
-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.Appointment;
+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.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.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;
+
+import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.CONSULTANT_SEND_FILL_SATISFACTION_NOTICE;
+import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.EDIT_CONSULTANT_DATA;
@RestController
@RequestMapping("/api/consultant")
@@ -27,6 +27,9 @@
@Autowired
ConsultantService consultantService;
+
+ @Autowired
+ AppointmentService appointmentService;
@GetMapping("/favorite")
public ResponseEntity<List<CustomerFavoriteConsultantDTO>> getMyConsultantList() {
@@ -97,8 +100,8 @@
}else {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
}
-
-
+
+
}
@PostMapping("/record/allAppointmentsView")
@@ -106,7 +109,8 @@
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())) {
@@ -115,4 +119,15 @@
Consultant editResult = consultantService.editConsultant(editDTO);
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);
+ if(!appointment.getAgentNo().equals(SecurityUtils.getAgentNo())) {
+ throw new IllegalAccessError();
+ }
+ consultantService.sendSatisfactionToClient(appointment);
+ return ResponseEntity.noContent().build();
+ }
}
--
Gitblit v1.8.0