[UPDATE] 解決弱點Cleartext sensitive data in a database

jack

2023-09-18 aef49f6faffbd93350f322db5fad339e2867656b

 pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java

@@ -1,24 +1,30 @@
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.appointment.process.AppointmentProcess;
import com.pollex.pam.domain.Appointment;
import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.service.SendMsgService;
import com.pollex.pam.service.dto.*;
import com.pollex.pam.business.aop.logging.audit.AuditLoggingInject;
import com.pollex.pam.business.aop.logging.audit.AuditLoggingType;
import com.pollex.pam.business.appointment.process.AppointmentProcess;
import com.pollex.pam.business.domain.Appointment;
import com.pollex.pam.business.enums.AppointmentStatusEnum;
import com.pollex.pam.business.security.SecurityUtils;
import com.pollex.pam.business.service.SendMsgService;

import com.pollex.pam.service.mapper.AppointmentMapper;
import com.pollex.pam.business.service.dto.*;
import com.pollex.pam.business.service.mapper.AppointmentMapper;
import com.pollex.pam.business.web.errors.CreateFailBecauseOfCancelAppointmentRecentException;
import com.pollex.pam.business.web.errors.CreateFailHaveProcessingAppointmentException;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

import com.pollex.pam.service.AppointmentService;
import com.pollex.pam.service.PersonalNotificationService;
import com.pollex.pam.service.SatisfactionService;
import com.pollex.pam.business.service.AppointmentService;
import com.pollex.pam.business.service.PersonalNotificationService;
import com.pollex.pam.business.service.SatisfactionService;

import static com.pollex.pam.aop.logging.audit.AuditLoggingType.*;
import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.*;

import java.util.List;

@RestController
@RequestMapping("/api/appointment")
@@ -60,8 +66,15 @@
    @AuditLoggingInject(type = AuditLoggingType.CUSTOMER_CREATE_APPOINTMENT)
   @PostMapping("/customer/create")
   public AppointmentDTO clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
        List<Appointment> processing = appointmentService.findProcessingAppointmentByCustomer(SecurityUtils.getCustomerDBId());
        List<Appointment> cancelAppointmentment = appointmentService.findCustomer3DayCancelAppointment();
        if(!processing.isEmpty()) {
           throw new CreateFailHaveProcessingAppointmentException();
       }else if(!cancelAppointmentment.isEmpty()) {
          throw new CreateFailBecauseOfCancelAppointmentRecentException();
       }
        
        Appointment appointment = appointmentService.customerCreateAppointment(appointmentCreateDTO);
        appointmentService.sendAppointmentNotify(appointment);
        satisfactionService.createUnfilledSystemSatisfaction(appointment);

        return appointmentMapper.toAppointmentDTO(appointment);
@@ -106,22 +119,10 @@
        String agentNo = SecurityUtils.getAgentNo();
        return new ResponseEntity<>(appointmentService.getConsultantPendingAppointmentSum(agentNo), HttpStatus.OK);
    }
    
    @GetMapping("/customer/get_all_group_by_consultant")
    public List<CustomerFavoriteConsultantDTO> getCustomerAllAppointmentGroupByConsultant() {
        return appointmentService.getCustomerAllAppointmentGroupByConsultant();
    }

//   @PostMapping("/close/info/edit")
//    public ResponseEntity<Void> editAppointmentClosedInfo(@RequestBody AppointmentCloseDTO closeDTO) {
//
//      if(closeDTO.getContactStatus() == ContactStatusEnum.DONE) {
//         DoneProcessDTO dto = new DoneProcessDTO();
//         BeanUtils.copyProperties(closeDTO, dto);
//         abstractAppointmentProcess.editClosedInfo(dto);
//      }else if(closeDTO.getContactStatus() == ContactStatusEnum.CLOSED){
//         ClosedProcessDTO dto = new ClosedProcessDTO();
//         BeanUtils.copyProperties(closeDTO, dto);
//         abstractAppointmentProcess.editClosedInfo(dto);
//      }else {
//         return ResponseEntity.notFound().build();
//      }
//
//        return ResponseEntity.noContent().build();
//    }
}