Merge remote-tracking branch 'origin/master'

src/main/java/com/viettel/campaign/filter/CorsFilter.java

@@ -32,25 +32,25 @@ public class CorsFilter implements Filter {
 
         chain.doFilter(req, response);
 
-//        if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
-//            chain.doFilter(req, resp);
-//            return;
-//        }
-//        if ("/".equals(request.getRequestURI())) {
-//            chain.doFilter(req, resp);
-//            return;
-//        }
-//        String xAuthToken = request.getHeader("X-Auth-Token");
-//        if (xAuthToken == null || "".equals(xAuthToken)) {
-//            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is null.");
-//            return;
-//        }
-//        Object obj = RedisUtil.getInstance().get(xAuthToken);
-//        if (obj instanceof UserSession) {
-//            chain.doFilter(req, resp);
-//        } else {
-//            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is invalid.");
-//        }
+        if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
+            chain.doFilter(req, resp);
+            return;
+        }
+        if ("/".equals(request.getRequestURI())) {
+            chain.doFilter(req, resp);
+            return;
+        }
+        String xAuthToken = request.getHeader("X-Auth-Token");
+        if (xAuthToken == null || "".equals(xAuthToken)) {
+            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is null.");
+            return;
+        }
+        Object obj = RedisUtil.getInstance().get(xAuthToken);
+        if (obj instanceof UserSession) {
+            chain.doFilter(req, resp);
+        } else {
+            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is invalid.");
+        }
     }
 
     @Override

src/main/java/com/viettel/campaign/repository/ccms_full/CampaignExecuteRepository.java

@@ -18,9 +18,9 @@ public interface CampaignExecuteRepository {
 
     List<ApParamDTO> getComboCampaignType(String companySiteId);
 
-    ResultDTO getInteractiveResult(CampaignRequestDTO dto);
+    List<ContactCustResultDTO> getInteractiveResult(CampaignRequestDTO dto, Pageable pageable);
 
-    List<ContactCusResDTO> getExcelInteractiveResult(CampaignRequestDTO dto);
+    List<ContactCustResultDTO> getExcelInteractiveResult(CampaignRequestDTO dto);
 
     List<ContactCustResultDTO> getContactCustById(CampaignRequestDTO dto);
     //</editor-fold: hungtt>

src/main/java/com/viettel/campaign/repository/ccms_full/impl/CampaignRepositoryImpl.java

@@ -19,7 +19,9 @@ import org.hibernate.transform.Transformers;
 import org.hibernate.type.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.domain.*;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Repository;
@@ -27,9 +29,10 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Repository
 public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
@@ -638,7 +641,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
                     "),\n" +
                     "data as (\n" +
                     "select a.*, rownum row_ from data_temp a\n" +
-                    "where a.totalCusList > 0" +
+                    "where a.totalCusCampaign > 0" +
                     "),\n" +
                     "count_data as (\n" +
                     "select count(*) totalRow from data_temp\n" +

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

@@ -2,6 +2,7 @@ package com.viettel.campaign.service;
 
 import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
+import com.viettel.econtact.filter.UserSession;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.stereotype.Service;
 
@@ -37,7 +38,7 @@ public interface CampaignExecuteService {
 
     ResultDTO getAgentLogout(CampaignRequestDTO dto);
 
-    ResultDTO callCustomer(ContactCustResultDTO dto);
+    ResultDTO callCustomer(ContactCustResultDTO dto, UserSession userSession);
 
     ResultDTO recallCustomer(ContactCustResultDTO dto);
 

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

@@ -61,6 +61,10 @@ public interface CustomerService {
 
     ResultDTO deleteCustomerFromCampaign(CampaignCustomerDTO campaignCustomerDTO);
 
+    ResultDTO searchCampaignInformation(CampaignCustomerDTO campaignCustomerDTO);
+
+    ResultDTO addCustomerToCampaign(CampaignCustomerDTO campaignCustomerDTO);
+
 
     // ------------ customer  ------------ //
 
@@ -86,6 +90,6 @@ public interface CustomerService {
 ////    List<CustomizeFields> searchCustomize();
     ResultDTO listCustomizeFields(CustomizeFieldsDTO customizeFields);
 
-    ResultDTO searchCustomizeFields(int page, int pageSize, long companySiteId, long campaignId, CustomerQueryDTO customerQueryDTO);
+    ResultDTO searchCustomizeFields(CampaignCustomerDTO campaignCustomerDTO);
 
 }

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

@@ -20,6 +20,7 @@ import org.modelmapper.ModelMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -100,11 +101,19 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO searchInteractiveResult(CampaignRequestDTO dto) {
         ResultDTO resultDTO = new ResultDTO();
+
         try {
-            resultDTO = campaignExecuteRepository.getInteractiveResult(dto);
+            List<ContactCustResultDTO> list = campaignExecuteRepository.getInteractiveResult(dto, SQLBuilder.buildPageable(dto));
+            resultDTO.setListData(list);
+            resultDTO.setTotalRow(campaignExecuteRepository.getInteractiveResult(dto, null).size());
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
         }
+
         return resultDTO;
     }
 
@@ -112,7 +121,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     @Transactional(DataSourceQualify.CCMS_FULL)
     public XSSFWorkbook exportInteractiveResult(CampaignRequestDTO dto) {
         Locale locale = Locale.forLanguageTag("vi");
-        List<ContactCusResDTO> list = campaignExecuteRepository.getExcelInteractiveResult(dto);
+        List<ContactCustResultDTO> list = campaignExecuteRepository.getExcelInteractiveResult(dto);
 
         XSSFWorkbook workbook = new XSSFWorkbook();
         Sheet sheet;
@@ -519,7 +528,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     }
 
     @Override
-    public ResultDTO callCustomer(ContactCustResultDTO dto) {
+    public ResultDTO callCustomer(ContactCustResultDTO dto, UserSession userSession) {
         ResultDTO result = new ResultDTO();
 
         try {

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

@@ -239,6 +239,8 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
             return resultDTO;
         }
         try {
+            scenarioQuestionDTO.setCode(scenarioQuestionDTO.getCode().trim());
+            scenarioQuestionDTO.setQuestion(scenarioQuestionDTO.getQuestion().trim());
             ScenarioQuestion scenarioQuestion = modelMapper.map(scenarioQuestionDTO, ScenarioQuestion.class);
 
             if (scenarioQuestion.getScenarioQuestionId() != null) {
@@ -271,6 +273,8 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
                         campaignLogAnswer.setCampaignId(scenarioQuestion.getCampaignId());
 
                         if (item.getScenarioAnswerId() != null) {
+                            item.setCode(item.getCode().trim());
+                            item.setAnswer(item.getAnswer().trim());
                             ScenarioAnswer answer = modelMapper.map(item, ScenarioAnswer.class);
                             scenarioAnswerRepository.save(answer);
                             campaignLogAnswer.setCustomerId(answer.getScenarioAnswerId());
@@ -281,6 +285,7 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
                             item.setScenarioQuestionId(scenarioQuestion.getScenarioQuestionId());
                             item.setCreateTime(new Date());
                             item.setStatus((short) 1);
+                            item.setAnswer(item.getAnswer().trim());
                             ScenarioAnswer answer = modelMapper.map(item, ScenarioAnswer.class);
                             scenarioAnswerRepository.save(answer);
                             campaignLogAnswer.setCustomerId(answer.getScenarioAnswerId());

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

@@ -72,6 +72,9 @@ public class ScenarioServiceImpl implements ScenarioService {
     public ResultDTO update(ScenarioDTO scenarioDTO) {
         ResultDTO resultDTO = new ResultDTO();
         try {
+            scenarioDTO.setCode(scenarioDTO.getCode().trim());
+            if (scenarioDTO.getDescription() != null) scenarioDTO.setDescription(scenarioDTO.getDescription().trim());
+            else scenarioDTO.setDescription("");
             scenarioDTO.setUpdateBy(null);
             scenarioDTO.setUpdateTime(new Date());
 
@@ -368,8 +371,8 @@ public class ScenarioServiceImpl implements ScenarioService {
                     if (rawDataList.get(i)[4] == null && rawDataList.get(i)[4].toString().trim().equals("")) {
                         sb.append(BundleUtils.getLangString("scenario.hashInput.required"));
                     }
-                    if((rawDataList.get(i)[7] != null && !rawDataList.get(i)[7].toString().trim().equals(""))) {
-                        if((rawDataList.get(i)[7].toString().trim().equals(tmpCurrentQuestionCode)) ||
+                    if ((rawDataList.get(i)[7] != null && !rawDataList.get(i)[7].toString().trim().equals(""))) {
+                        if ((rawDataList.get(i)[7].toString().trim().equals(tmpCurrentQuestionCode)) ||
                                 validateMappingQuestion(rawDataList.get(i)[7].toString().trim(), tmpCurrentQuestionCode, lstImportQuestionCodes))
                             sb.append(BundleUtils.getLangString("scenario.mappingQuestion.invalid"));
                     }
@@ -390,17 +393,15 @@ public class ScenarioServiceImpl implements ScenarioService {
 
             //insert data
             if (isValid) {
-                logger.info("----- Data valid, start import scenario question -----");
                 List<ScenarioQuestionDTO> lstQuestion = buildQuestionsLst(rawDataList, scenarioId, campaignId, companySiteId);
                 lstQuestion.forEach(question -> {
-//                    questionService.add(question);
+                    questionService.add(question);
                 });
                 FileOutputStream fos = new FileOutputStream(file);
                 workbook.write(fos);
                 result.put("file", file);
                 result.put("message", BundleUtils.getLangString("customer.importSuccess", locale));
             } else {
-                logger.info("----- Data invalid, can't import scenario question -----");
                 FileOutputStream fos = new FileOutputStream(file);
                 workbook.write(fos);
                 result.put("file", file);
@@ -415,12 +416,12 @@ public class ScenarioServiceImpl implements ScenarioService {
     }
 
     private boolean validateMappingQuestion(String mappingQuestion, String currentQuestionCode, List<String> lstQuestionCode) {
-        if(mappingQuestion == currentQuestionCode) return false;
+        if (mappingQuestion == currentQuestionCode) return false;
 
         String duplicateCode = lstQuestionCode.stream().
                 filter(p -> (p.equals(mappingQuestion) && p.equals(currentQuestionCode))).
                 findAny().orElse(null);
-        if(duplicateCode == null) return false;
+        if (duplicateCode == null) return false;
 
 //        String notMappedCode = lstQuestionCode.stream().filter(p -> (!p.equals(mappingQuestion))).findAny().orElse(null);
 //        if(notMappedCode != null) return false;

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

 package com.viettel.campaign.web.dto;
 
+import com.viettel.campaign.web.dto.request_dto.CustomerQueryDTO;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.Date;
+import java.util.List;
 
 @Getter
 @Setter
@@ -27,4 +29,7 @@ public class CampaignCustomerDTO extends BaseDTO{
     private Long companySiteId;
     private Long complainId;
     private String lstCustomerId;
+    private List<CustomerQueryDTO>  listQuery;
+
+
 }

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

@@ -16,4 +16,5 @@ public class CampaignInformationDTO {
     private Long totalNotCall;
     private Long campaignCustomer;
     private Long customerListId;
+    private Long totalCusInList;
 }

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

-package com.viettel.campaign.web.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-//import java.io.Serializable;
-import java.util.Date;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-public class ContactCusResDTO {
-    private Long contactCustResultId;
-    private String campaignCode;
-    private String campaignName;
-    private String userName;
-    private String phoneNumber;
-    private String customerName;
-    private Date startCall;
-    private Date createTime;
-    private String contactStatus;
-    private String surveyStatus;
-    private String status;
-    private String recordStatus;
-    private Long callTime;
-    private Boolean enableEdit;
-    private Integer totalRow;
-}

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

@@ -14,7 +14,7 @@ public class ContactCustResultDTO extends BaseDTO {
     private Long contactCustResultId;
     private Long companySiteId;
     private Short callStatus;
-    private Short contactStatus;
+    private String contactStatus;
     private Short status;
     private Integer satisfaction;
     private String description;
@@ -53,4 +53,6 @@ public class ContactCustResultDTO extends BaseDTO {
     private String userName;
     private String surveyStatus;
     private Boolean enableEdit;
+
+    private Integer totalRow;
 }

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

 package com.viettel.campaign.web.dto;
 
+import com.viettel.campaign.web.dto.request_dto.CustomerQueryDTO;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.Date;
+import java.util.List;
 
 @Getter
 @Setter
@@ -29,4 +31,5 @@ public class CustomizeFieldsDTO extends BaseDTO {
     private Long min;
     private Long max;
     private Long active;
+
 }

src/main/java/com/viettel/campaign/web/dto/request_dto/CustomerQueryDTO.java

@@ -11,4 +11,5 @@ public class CustomerQueryDTO extends BaseDTO {
     String field;
     String operator;
     String condition;
+
 }

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

 package com.viettel.campaign.web.rest;
 
 import com.viettel.campaign.service.CampaignExecuteService;
+import com.viettel.campaign.utils.RedisUtil;
 import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
+import com.viettel.econtact.filter.UserSession;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -134,8 +136,10 @@ public class CampaignExecuteController {
 
     @PostMapping("/callCustomer")
     @ResponseBody
-    public ResponseEntity<ResultDTO> callCustomer(@RequestBody ContactCustResultDTO requestDto) {
-        ResultDTO result = campaignExecuteService.callCustomer(requestDto);
+    public ResponseEntity<ResultDTO> callCustomer(@RequestBody ContactCustResultDTO requestDto, HttpServletRequest request) {
+        String xAuthToken = request.getHeader("X-Auth-Token");
+        UserSession userSession = (UserSession) RedisUtil.getInstance().get(xAuthToken);
+        ResultDTO result = campaignExecuteService.callCustomer(requestDto, userSession);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 

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

@@ -10,6 +10,7 @@ import com.viettel.campaign.utils.Config;
 import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.utils.RedisUtil;
 import com.viettel.campaign.web.dto.*;
+import com.viettel.campaign.web.dto.request_dto.CustomerQueryDTO;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.CustomizeRequestDTo;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
@@ -245,6 +246,20 @@ public class CustomerController {
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }
 
+    @PostMapping("/searchCampaignInformation")
+    @ResponseBody
+    public ResponseEntity<?> searchCampaignInformation(@RequestBody CampaignCustomerDTO dto) {
+        ResultDTO resultDTO = customerService.searchCampaignInformation(dto);
+        return new ResponseEntity<>(resultDTO, HttpStatus.OK);
+    }
+
+    @PostMapping("/addCustomerToCampaign")
+    @ResponseBody
+    public ResponseEntity<?> addCustomerToCampaign(@RequestBody CampaignCustomerDTO dto) {
+        ResultDTO resultDTO = customerService.addCustomerToCampaign(dto);
+        return new ResponseEntity<>(resultDTO, HttpStatus.OK);
+    }
+
 
 
     private String saveUploadFile(MultipartFile file) {
@@ -293,4 +308,13 @@ public class CustomerController {
         ResultDTO resultDTO = customerService.listCustomizeFields(customizeRequestDTo);
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }
+
+    @PostMapping("/searchCustomizeFields")
+    @ResponseBody
+    public ResponseEntity searchCustomizeFields(@RequestBody CampaignCustomerDTO campaignCustomerDTO ) {
+        ResultDTO result = customerService.searchCustomizeFields(campaignCustomerDTO);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+
 }

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

@@ -121,20 +121,18 @@ public class ScenarioController {
             Map<String, Object> map = scenarioService.readAndValidateCustomer(path, scenarioId, campaignId, userSession.getCompanySiteId());
             File fileExport = (File) map.get("file");
             String message = (String) map.get("message");
-            ResultDTO resultDTO = new ResultDTO();
-            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            ResultDTO resultDTO= new ResultDTO();
+            resultDTO.setErrorCode("00");
             resultDTO.setDescription(message);
-            return new ResponseEntity<>(resultDTO, HttpStatus.OK);
-//            return ResponseEntity.ok()
-//                    .header("Content-Type", Constants.MIME_TYPE.EXCEL_XLSX)
-//                    .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=import_scenario_result.xlsx")
-//                    .header("Message", message)
-//                    .body(Files.readAllBytes(fileExport.toPath()));
+            resultDTO.setData(fileExport);
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("Content-Type", Constants.MIME_TYPE.EXCEL_XLSX);
+            headers.add("Message", message);
+            return ResponseEntity.ok()
+                    .headers(headers)
+                    .body(Files.readAllBytes(fileExport.toPath()));
         } catch (Exception e) {
             logger.error(e.getMessage());
-            ResultDTO resultDTO = new ResultDTO();
-            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
-            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
     }