Merge branch 'tubn'

# Conflicts:
#	log/campaign.log

src/main/java/com/viettel/campaign/repository/acd_full/AgentsRepository.java

@@ -17,5 +17,5 @@ public interface AgentsRepository extends JpaRepository<Agents, String> {
 
     @Modifying
     @Query(value = "UPDATE Agents SET campaignSystemStatus = :campaignSystemStatus WHERE agentId = :agentId")
-    void updateAgentLogoutFromCampaign(@Param("agentId") Long agentId, @Param("campaignSystemStatus") String campaignSystemStatus);
+    void updateAgentLogoutFromCampaign(@Param("agentId") String agentId, @Param("campaignSystemStatus") String campaignSystemStatus);
 }

src/main/java/com/viettel/campaign/service/CampaignExecuteService.java

@@ -28,7 +28,9 @@ public interface CampaignExecuteService {
 
     ResultDTO getExecuteCampaign(CampaignRequestDTO requestDto);
 
-    ResultDTO getCall(CampaignCustomerDTO dto);
+    ResultDTO getCustomer(CampaignCustomerDTO dto);
+
+    ResultDTO getCustomerComplete(ReceiveCustLogDTO dto);
 
     ResultDTO getCallLog(ReceiveCustLogDTO dto);
 

src/main/java/com/viettel/campaign/service/impl/CampaignExecuteServiceImp.java

@@ -4,6 +4,7 @@ import com.viettel.campaign.config.DataSourceQualify;
 import com.viettel.campaign.model.acd_full.Agents;
 import com.viettel.campaign.model.ccms_full.CampaignCustomer;
 import com.viettel.campaign.model.ccms_full.ContactCustResult;
+import com.viettel.campaign.model.ccms_full.ReceiveCustLog;
 import com.viettel.campaign.repository.acd_full.AgentsRepository;
 import com.viettel.campaign.repository.ccms_full.*;
 import com.viettel.campaign.service.CampaignExecuteService;
@@ -245,9 +246,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
             //TimeRangeDialMode rangeDialMode = rangeDialModeRepository.findDialModeAtCurrent(Long.parseLong(requestDto.getCampaignId()), Long.parseLong(requestDto.getCompanySiteId()));
 
             if (agents.getUserStatus() != null && agents.getCampaignSystemStatus() != null) {
-                // tạm thời bỏ qua điều kiện này vì DB ACD không thực thi update được
-                // if (agents.getUserStatus().equalsIgnoreCase("CALLOUT") && agents.getCampaignSystemStatus().equalsIgnoreCase("AVAILABLE")) {
-                if (agents.getCampaignSystemStatus().equalsIgnoreCase("AVAILABLE")) {
+                 if (agents.getUserStatus().equalsIgnoreCase("CALLOUT") && agents.getCampaignSystemStatus().equalsIgnoreCase("AVAILABLE")) {
                     //if (zoneDialMode != null && zoneDialMode.getDialMode().equals(0) || rangeDialMode != null && rangeDialMode.getDialMode().equals(0))
                     data.put("dialModeManual", "1");
                 }
@@ -269,9 +268,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
             Agents agents = agentsRepository.findByAgentId(requestDto.getAgentId());
             //TimeZoneDialMode zoneDialMode = zoneDialModeRepository.findDialModeAtCurrent(Long.parseLong(requestDto.getCampaignId()), Long.parseLong(requestDto.getCompanySiteId()));
             //TimeRangeDialMode rangeDialMode = rangeDialModeRepository.findDialModeAtCurrent(Long.parseLong(requestDto.getCampaignId()), Long.parseLong(requestDto.getCompanySiteId()));
-            // tạm thời bỏ qua điều kiện này vì DB ACD không thực thi update được
-            // if (agents.getUserStatus().equalsIgnoreCase("CALLOUT") && agents.getCampaignSystemStatus().equalsIgnoreCase("LOGOUT")) {
-            if (agents.getCampaignSystemStatus().equalsIgnoreCase("LOGOUT")) {
+             if (agents.getUserStatus().equalsIgnoreCase("CALLOUT") && agents.getCampaignSystemStatus().equalsIgnoreCase("LOGOUT")) {
                 //if (zoneDialMode != null && zoneDialMode.getDialMode().equals(0) || rangeDialMode != null && rangeDialMode.getDialMode().equals(0))
                 // update acd_full.agents table
                 Agents a = new Agents();
@@ -292,7 +289,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     }
 
     @Override
-    public ResultDTO getCall(CampaignCustomerDTO dto) {
+    public ResultDTO getCustomer(CampaignCustomerDTO dto) {
         ResultDTO result = new ResultDTO();
 
         //Agents agents = agentsRepository.findByAgentId(dto.getAgentId());
@@ -442,6 +439,26 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
         return result;
     }
 
+    @Override
+    public ResultDTO getCustomerComplete(ReceiveCustLogDTO dto) {
+        ResultDTO result = new ResultDTO();
+
+        try {
+            ReceiveCustLog rclResult = custLogRepository.save(modelMapper.map(dto, ReceiveCustLog.class));
+            agentsRepository.updateAgentLogoutFromCampaign(dto.getAgentId().toString(), "NOT AVAILABLE");
+
+            result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            result.setDescription(Constants.ApiErrorDesc.SUCCESS);
+            result.setData(rclResult);
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.setErrorCode(Constants.ApiErrorCode.ERROR);
+            result.setDescription(Constants.ApiErrorDesc.ERROR);
+        }
+
+        return result;
+    }
+
     @Override
     public ResultDTO getCallLog(ReceiveCustLogDTO dto) {
         ResultDTO result = new ResultDTO();
@@ -467,7 +484,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
         ResultDTO result = new ResultDTO();
 
         try {
-            agentsRepository.updateAgentLogoutFromCampaign(Long.parseLong(dto.getAgentId()), "LOGOUT");
+            agentsRepository.updateAgentLogoutFromCampaign(dto.getAgentId(), "LOGOUT");
             campaignAgentRepository.updateCampaignAgentSetStatus(Long.parseLong(dto.getAgentId()), Long.parseLong(dto.getCampaignId()), 0);
 
             result.setErrorCode(Constants.ApiErrorCode.SUCCESS);

src/main/java/com/viettel/campaign/service/impl/ScenarioServiceImpl.java

@@ -126,6 +126,7 @@ public class ScenarioServiceImpl implements ScenarioService {
         }
         return null;
     }
+
     public ResultDTO saveContacQuestResult(ContactQuestResultDTO dto) {
         ResultDTO resultDTO = new ResultDTO();
 

src/main/java/com/viettel/campaign/web/dto/ContactCustResultDTO.java

@@ -10,7 +10,7 @@ import java.util.Date;
 @Getter
 @Setter
 @NoArgsConstructor
-public class ContactCustResultDTO extends BaseDTO{
+public class ContactCustResultDTO extends BaseDTO {
     private Long contactCustResultId;
     private Long companySiteId;
     private Short callStatus;

src/main/java/com/viettel/campaign/web/rest/CampaignController.java

 package com.viettel.campaign.web.rest;
 
-import com.viettel.campaign.model.ccms_full.CustomizeFields;
 import com.viettel.campaign.model.ccms_full.TimeRangeDialMode;
 import com.viettel.campaign.model.ccms_full.TimeZoneDialMode;
 import com.viettel.campaign.service.CampaignExecuteService;
@@ -26,13 +25,10 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.nio.file.Files;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Objects;
 
 @RestController
@@ -63,10 +59,17 @@ public class CampaignController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
-    @PostMapping("/getCall")
+    @PostMapping("/getCustomer")
     @ResponseBody
-    public ResponseEntity<ResultDTO> getCall(@RequestBody CampaignCustomerDTO requestDto) {
-        ResultDTO result = campaignExecuteService.getCall(requestDto);
+    public ResponseEntity<ResultDTO> getCustomer(@RequestBody CampaignCustomerDTO requestDto) {
+        ResultDTO result = campaignExecuteService.getCustomer(requestDto);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+    @PostMapping("/getCustomerComplete")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> getCustomerComplete(@RequestBody ReceiveCustLogDTO requestDto) {
+        ResultDTO result = campaignExecuteService.getCustomerComplete(requestDto);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
@@ -294,6 +297,7 @@ public class CampaignController {
         ResultDTO resultDTO = campaignService.deleteCustomerListFromCampaign(campaignRequestDTO);
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }
+
     @RequestMapping(value = "/renewCampaign", method = RequestMethod.PUT)
     public ResponseEntity<ResultDTO> renewCampaign(@RequestBody CampaignDTO campaignDTO) {
         ResultDTO result = campaignService.renewCampaign(campaignDTO);
@@ -322,7 +326,7 @@ public class CampaignController {
 //                    .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=template_import_customer.xlsx")
 //                    .header("Message", message)
 //                    .body(Files.readAllBytes(fileExport.toPath()));
-            return new ResponseEntity<>(null,HttpStatus.OK);
+            return new ResponseEntity<>(null, HttpStatus.OK);
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);

src/main/resources/application.yml

 server:
-  port: 9999
+  port: 1111
 spring:
   application:
     name: campaign