[fix] 修正OtpResource 在 git merge時導致的錯誤

wayne

2021-11-25 56b8aa40e7e73b92f983a2c6ee0f87adbe2b4731

 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,13 +43,20 @@
        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);
@@ -53,10 +67,20 @@
        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);
        }
    }
}