Merge branch 'master' into tubn

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

@@ -26,18 +26,19 @@ public class CorsFilter implements Filter {
         response.setHeader("Access-Control-Allow-Origin", "*");
         response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT");
         response.setHeader("Access-Control-Max-Age", "3600");
-        response.setHeader("Access-Control-Allow-Headers", "Origin, Authorization, X-Requested-With, Content-Type, Accept, token1, X-Auth-Token");
+        response.setHeader("Access-Control-Allow-Headers", "Origin, Authorization, X-Requested-With, Content-Type, Accept, token1, X-Auth-Token, Message");
+        response.setHeader("Access-Control-Expose-Headers", "Message");
 
         HttpServletRequest request = (HttpServletRequest) req;
 
-        chain.doFilter(req, response);
+//        chain.doFilter(req, response);
 
         if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
-            chain.doFilter(req, resp);
+            chain.doFilter(request, resp);
             return;
         }
         if ("/".equals(request.getRequestURI())) {
-            chain.doFilter(req, resp);
+            chain.doFilter(request, resp);
             return;
         }
         String xAuthToken = request.getHeader("X-Auth-Token");
@@ -47,7 +48,7 @@ public class CorsFilter implements Filter {
         }
         Object obj = RedisUtil.getInstance().get(xAuthToken);
         if (obj instanceof UserSession) {
-            chain.doFilter(req, resp);
+            chain.doFilter(request, resp);
         } else {
             response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is invalid.");
         }

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/AgentsService.java

@@ -19,5 +19,7 @@ public interface AgentsService {
 
     ResultDTO searchCampaignAgentByName(int page, int pageSize, Long companySiteId, String userName, String fullName);
 
+    ResultDTO searchCampaignAgentSelectByName(int page, int pageSize, Long companySiteId, Long campaignId, String userName, String fullName);
+
     ResultDTO createMultipleCampaignAgent(CampaignAgentRequestDTO campaignAgentRequestDTO);
 }

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/AgentsServiceImpl.java

@@ -88,13 +88,18 @@ public class AgentsServiceImpl implements AgentsService {
             sb.append("    a.FULL_NAME fullName,");
             sb.append("    a.COMPANY_SITE_ID companySiteId,");
             sb.append("    b.FILTER_TYPE filterType,");
-            sb.append("    b.CAMPAIGN_AGENT_ID campaignAgentId");
+            sb.append("    b.CAMPAIGN_AGENT_ID campaignAgentId,");
+            sb.append("    d.ROLE_CODE roleCode");
             sb.append(" FROM VSA_USERS a");
             sb.append(" LEFT JOIN CAMPAIGN_AGENT b on a.USER_ID = b.AGENT_ID");
+            sb.append(" INNER JOIN USER_ROLE c on a.USER_ID = c.USER_ID");
+            sb.append(" INNER JOIN ROLE d on c.ROLE_ID = d.ROLE_ID");
             sb.append(" WHERE 1 = 1");
             sb.append(" AND a.COMPANY_SITE_ID = :p_company_site_id");
+            sb.append(" AND a.STATUS = 1");
             sb.append(" AND b.AGENT_ID IS NULL");
-            sb.append(" ORDER BY a.FULL_NAME ASC");
+            sb.append(" AND d.ROLE_CODE IN ('AGENT', 'SUPERVISOR')");
+            sb.append(" ORDER BY UPPER(a.FULL_NAME)");
 
             SQLQuery query = session.createSQLQuery(sb.toString());
 
@@ -107,6 +112,7 @@ public class AgentsServiceImpl implements AgentsService {
             query.addScalar("companySiteId", new LongType());
             query.addScalar("filterType", new ShortType());
             query.addScalar("campaignAgentId", new LongType());
+            query.addScalar("roleCode", new StringType());
 
             query.setResultTransformer(Transformers.aliasToBean(VSAUsersDTO.class));
             int count = 0;
@@ -157,20 +163,21 @@ public class AgentsServiceImpl implements AgentsService {
 
 
             sb.append("SELECT");
-            sb.append("    a.USER_ID userId,");
-            sb.append("    a.USER_NAME userName,");
-            sb.append("    a.STATUS status,");
-            sb.append("    a.FULL_NAME fullName,");
+            sb.append("    a.CAMPAIGN_AGENT_ID campaignAgentId,");
+            sb.append("    a.FILTER_TYPE filterType,");
             sb.append("    a.COMPANY_SITE_ID companySiteId,");
-            sb.append("    b.FILTER_TYPE filterType,");
-            sb.append("    b.CAMPAIGN_AGENT_ID campaignAgentId");
-            sb.append(" FROM VSA_USERS a");
+            sb.append("    b.USER_ID userId,");
+            sb.append("    b.USER_NAME userName,");
+            sb.append("    b.STATUS status,");
+            sb.append("    b.FULL_NAME fullName");
+
+            sb.append(" FROM CAMPAIGN_AGENT a");
 
-            sb.append(" RIGHT JOIN CAMPAIGN_AGENT b on a.USER_ID = b.AGENT_ID");
+            sb.append(" INNER JOIN VSA_USERS b ON a.AGENT_ID = b.USER_ID");
             sb.append(" WHERE 1 = 1");
-            sb.append(" AND b.COMPANY_SITE_ID = :p_company_site_id");
-            sb.append(" AND b.CAMPAIGN_ID = :p_campaign_id");
-            sb.append(" ORDER BY a.FULL_NAME ASC");
+            sb.append(" AND a.COMPANY_SITE_ID = :p_company_site_id");
+            sb.append(" AND a.CAMPAIGN_ID = :p_campaign_id");
+            sb.append(" ORDER BY UPPER(b.FULL_NAME)");
 
             SQLQuery query = session.createSQLQuery(sb.toString());
 
@@ -295,8 +302,8 @@ public class AgentsServiceImpl implements AgentsService {
             sqlStrBuilder.append("    b.CAMPAIGN_AGENT_ID campaignAgentId");
             sqlStrBuilder.append(" FROM VSA_USERS a");
             sqlStrBuilder.append(" LEFT JOIN CAMPAIGN_AGENT b on a.USER_ID = b.AGENT_ID");
-            sqlStrBuilder.append(" JOIN USER_ROLE c on a.USER_ID = c.USER_ID");
-            sqlStrBuilder.append(" JOIN ROLE d on c.ROLE_ID = d.ROLE_ID");
+            sqlStrBuilder.append(" INNER JOIN USER_ROLE c on a.USER_ID = c.USER_ID");
+            sqlStrBuilder.append(" INNER JOIN ROLE d on c.ROLE_ID = d.ROLE_ID");
             sqlStrBuilder.append(" WHERE 1 = 1");
             sqlStrBuilder.append(" AND a.COMPANY_SITE_ID = :p_company_site_id");
 
@@ -310,8 +317,8 @@ public class AgentsServiceImpl implements AgentsService {
 
             sqlStrBuilder.append(" AND d.ROLE_CODE IN ('AGENT', 'SUPERVISOR')");
             sqlStrBuilder.append(" AND a.STATUS = 1");
-            sqlStrBuilder.append(" AND b.CAMPAIGN_AGENT_ID IS NULL");
-            sqlStrBuilder.append(" ORDER BY a.FULL_NAME ASC");
+            sqlStrBuilder.append(" AND b.AGENT_ID IS NULL");
+            sqlStrBuilder.append(" ORDER BY UPPER(a.FULL_NAME)");
 
             SQLQuery query = session.createSQLQuery(sqlStrBuilder.toString());
 
@@ -319,7 +326,112 @@ public class AgentsServiceImpl implements AgentsService {
 
             if (!DataUtil.isNullOrEmpty(userName)) {
                 query.setParameter("p_user_name", "%" +
-                        userName
+                        userName.trim()
+                                .replace("\\", "\\\\")
+                                .replaceAll("%", "\\%")
+                                .replaceAll("_", "\\_")
+                        + "%");
+            }
+
+            if (!DataUtil.isNullOrEmpty(fullName)) {
+                query.setParameter("p_full_name", "%" +
+                        fullName.trim()
+                                .replace("\\", "\\\\")
+                                .replaceAll("%", "\\%")
+                                .replaceAll("_", "\\_")
+                        + "%");
+            }
+
+            query.addScalar("userId", new LongType());
+            query.addScalar("userName", new StringType());
+            query.addScalar("status", new ShortType());
+            query.addScalar("fullName", new StringType());
+            query.addScalar("companySiteId", new LongType());
+            query.addScalar("filterType", new ShortType());
+            query.addScalar("campaignAgentId", new LongType());
+
+            query.setResultTransformer(Transformers.aliasToBean(VSAUsersDTO.class));
+            int count = 0;
+            List<VSAUsersDTO> dtoList = query.list();
+            if (dtoList.size() > 0) {
+                count = query.list().size();
+            }
+
+            Pageable pageable = PageRequest.of(page, pageSize);
+            if (pageable != null) {
+                query.setFirstResult(pageable.getPageNumber() * pageable.getPageSize());
+                query.setMaxResults(pageable.getPageSize());
+            }
+
+            List<VSAUsersDTO> data = query.list();
+            Page<VSAUsersDTO> dataPage = new PageImpl<>(data, pageable, count);
+            resultDTO.setData(dataPage);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+        } catch (Exception e) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+        } finally {
+            session.close();
+        }
+
+        return resultDTO;
+    }
+
+    @Override
+    public ResultDTO searchCampaignAgentSelectByName(int page, int pageSize, Long companySiteId, Long campaignId, String userName, String fullName) {
+        ResultDTO resultDTO = new ResultDTO();
+        SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
+
+        Session session = sessionFactory.openSession();
+        session.beginTransaction();
+
+        if (DataUtil.isNullOrZero(companySiteId)) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+            return resultDTO;
+        }
+
+        try {
+//            StringBuilder sb = new StringBuilder();
+//            sb.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "campaign-agents-by-params"));
+            StringBuilder sb = new StringBuilder();
+
+
+            sb.append("SELECT");
+            sb.append("    a.CAMPAIGN_AGENT_ID campaignAgentId,");
+            sb.append("    a.FILTER_TYPE filterType,");
+            sb.append("    a.COMPANY_SITE_ID companySiteId,");
+            sb.append("    b.USER_ID userId,");
+            sb.append("    b.USER_NAME userName,");
+            sb.append("    b.STATUS status,");
+            sb.append("    b.FULL_NAME fullName");
+
+            sb.append(" FROM CAMPAIGN_AGENT a");
+
+            sb.append(" INNER JOIN VSA_USERS b ON a.AGENT_ID = b.USER_ID");
+            sb.append(" WHERE 1 = 1");
+            sb.append(" AND a.COMPANY_SITE_ID = :p_company_site_id");
+            sb.append(" AND a.CAMPAIGN_ID = :p_campaign_id");
+
+            if (!DataUtil.isNullOrEmpty(userName)) {
+                sb.append(" AND UPPER(b.USER_NAME) LIKE UPPER(:p_user_name)");
+            }
+
+            if (!DataUtil.isNullOrEmpty(fullName)) {
+                sb.append(" AND UPPER(b.FULL_NAME) LIKE UPPER(:p_full_name)");
+            }
+
+            sb.append(" ORDER BY UPPER(b.FULL_NAME)");
+
+            SQLQuery query = session.createSQLQuery(sb.toString());
+
+            query.setParameter("p_company_site_id", companySiteId);
+            query.setParameter("p_campaign_id", campaignId);
+
+            if (!DataUtil.isNullOrEmpty(userName)) {
+                query.setParameter("p_user_name", "%" +
+                        userName.trim()
                                 .replace("\\", "\\\\")
                                 .replaceAll("%", "\\%")
                                 .replaceAll("_", "\\_")
@@ -328,7 +440,7 @@ public class AgentsServiceImpl implements AgentsService {
 
             if (!DataUtil.isNullOrEmpty(fullName)) {
                 query.setParameter("p_full_name", "%" +
-                        fullName
+                        fullName.trim()
                                 .replace("\\", "\\\\")
                                 .replaceAll("%", "\\%")
                                 .replaceAll("_", "\\_")

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/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/VSAUsersDTO.java

@@ -35,4 +35,5 @@ public class VSAUsersDTO {
 //    String userKazooId;
     Short filterType;
     Long campaignAgentId;
+    String roleCode;
 }

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/AgentsController.java

@@ -68,6 +68,13 @@ public class AgentsController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
+    @GetMapping("/searchCampaignAgentSelect")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> searchCampaignAgentSelect(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("companySiteId") Long companySiteId, @RequestParam("campaignId") Long campaignId, @RequestParam("userName") String userName, @RequestParam("fullName") String fullName) {
+        ResultDTO result = agentsService.searchCampaignAgentSelectByName(page, pageSize, companySiteId, campaignId, userName, fullName);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
     @PostMapping("/createMultipleCampaignAgent")
     @ResponseBody
     public ResultDTO createMultipleCampaignAgent(@RequestBody @Valid CampaignAgentRequestDTO campaignAgentRequestDTO) {

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

 package com.viettel.campaign.web.rest;
 
-import com.viettel.campaign.model.ccms_full.CampaignCustomer;
 import com.viettel.campaign.model.ccms_full.Customer;
 import com.viettel.campaign.model.ccms_full.CustomizeFieldObject;
 import com.viettel.campaign.model.ccms_full.CustomizeFields;
 import com.viettel.campaign.repository.ccms_full.CustomerQueryRepository;
-import com.viettel.campaign.repository.ccms_full.impl.CustomerQueryRepositoryImpl;
 import com.viettel.campaign.service.CustomerService;
-import com.viettel.campaign.utils.BundleUtils;
 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.CustomerRequestDTO;
-import com.viettel.campaign.web.dto.request_dto.CustomizeRequestDTo;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 import com.viettel.econtact.filter.UserSession;
 import org.apache.commons.io.FilenameUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -117,12 +112,6 @@ public class CustomerController {
         // VIẾT ĐI VIẾT LẠI 4 LẦN RỒI ĐẤY
         String xAuthToken = request.getHeader("X-Auth-Token");
         UserSession userSession = (UserSession) RedisUtil.getInstance().get(xAuthToken);
-
-        if (userSession == null) {
-            userSession = new UserSession();
-            userSession.setSiteId(customerListDTO.getCompanySiteId());
-            userSession.setUserName("its4");
-        }
         return customerService.createCustomerList(customerListDTO, userSession.getUserName());
     }
 
@@ -184,14 +173,15 @@ public class CustomerController {
     }
 
     //<editor-fold desc="Download and import excel" defaultstate="collapsed">
-    @GetMapping(value = "/downloadFileTemplate")
-    public ResponseEntity<byte[]> downloadFileTemplate(@RequestParam("companySiteId") Long companySiteId) {
+    @PostMapping(value = "/downloadFileTemplate")
+    public ResponseEntity<byte[]> downloadFileTemplate(@RequestBody Long companySiteId) {
         LOGGER.info("--------DOWNLOAD FILE TEMPLATE---------");
         try {
             byte[] content = customerService.buildTemplate(companySiteId);
             return ResponseEntity.ok()
-                    .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=template_import_customer.xlsx")
-                    .header("Content-Type", Constants.MIME_TYPE.EXCEL_XLSX)
+                    // 2 dòng này không hiểu sao lại không hoạt động nữa
+//                    .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=template_import_customer.xlsx")
+//                    .header("Content-Type", Constants.MIME_TYPE.EXCEL_XLSX)
                     .body(content);
         } catch (Exception e) {
             LOGGER.error(e.getMessage());
@@ -200,34 +190,27 @@ public class CustomerController {
     }
 
     @PostMapping(value = "/importFile")
-    public ResponseEntity<?> importFile(@RequestParam("file") MultipartFile file,
-                                        @RequestParam("customerListId") String customerListId,
+    public ResponseEntity<?> importFile(@RequestPart("file") MultipartFile file,
+                                        @RequestPart("customerListId") String customerListId,
                                         HttpServletRequest request) {
         LOGGER.info("------------IMPORT FILE TEMPLATE--------------");
         Locale locale = new Locale("vi", "VN");
         try {
             UserSession userSession = (UserSession) RedisUtil.getInstance().get(request.getHeader("X-Auth-Token"));
-            if (userSession == null) {
-                userSession = new UserSession();
-                userSession.setSiteId(662691L);
-                userSession.setUserName("its3");
-            }
             if (file.isEmpty()) {
-                return new ResponseEntity<>(BundleUtils.getLangString("customer.fileNotSelected"), HttpStatus.OK);
+                return new ResponseEntity<>("file-empty", HttpStatus.OK);
             }
             if (!Objects.equals(FilenameUtils.getExtension(file.getOriginalFilename()), Constants.FileType.xlsx)) {
-                return new ResponseEntity<>(BundleUtils.getLangString("customer.invalidTemplate", locale), HttpStatus.OK);
+                return new ResponseEntity<>("template-invalid", HttpStatus.OK);
             }
             String path = saveUploadFile(file);
             List<CustomizeFields> dynamicHeaders = customerService.getDynamicHeader(userSession.getCompanySiteId());
             Map<String, Object> map = customerService.readAndValidateCustomer(path, dynamicHeaders, userSession, Long.parseLong(customerListId));
-            File fileExport = (File) map.get("file");
             String message = (String) map.get("message");
+            byte[] content = (byte[]) map.get("content");
             return ResponseEntity.ok()
-                    .header("Content-Type", Constants.MIME_TYPE.EXCEL_XLSX)
-                    .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=template_import_customer.xlsx")
                     .header("Message", message)
-                    .body(Files.readAllBytes(fileExport.toPath()));
+                    .body(content);
         } catch (Exception e) {
             LOGGER.error(e.getMessage());
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
@@ -260,6 +243,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) {
@@ -308,4 +305,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);
         }
     }

src/main/resources/application.yml

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

src/main/resources/i18n/language_en.properties

@@ -87,7 +87,6 @@ customer.cusType.vip = VIP
 customer.cusType.blacklist = Blacklist
 customer.yes = Yes
 customer.not = No
-customer.invalidTemplate = Invalid Template
 customer.noData = Template empty
 customer.nameRequired = Full name required;
 customer.emailMax50 = Email must less than 50 character;
@@ -102,7 +101,6 @@ customer.notGreaterThan = not greater than
 customer.notLessThan = not less than
 customer.importCustomer = IMPORT CUSTOMER
 customer.notice = Attention: A record is valid when Full Name is not null and one of three fields Main phone, secondary phone or email is not null
-customer.fileNotSelected=Please select a file
 customer.emailInvalid=Invalid email;
 customer.emailExists=Email exists;
 

src/main/resources/i18n/language_vi.properties

@@ -89,7 +89,6 @@ customer.cusType.vip = VIP
 customer.cusType.blacklist = Blacklist
 customer.yes = Có
 customer.not = Không
-customer.invalidTemplate = Template sai định dạng
 customer.noData = Template không có dữ liệu
 customer.nameRequired = Họ và tên không được để trống;
 customer.emailMax50 = Email không được quá 50 kí tự;
@@ -104,7 +103,6 @@ customer.notGreaterThan = không được lớn hơn
 customer.notLessThan = không được nhỏ hơn
 customer.importCustomer = IMPORT KHÁCH HÀNG
 customer.notice = Chú ý: 1 bản ghi được coi là hợp lệ bắt buộc phải có thông tin Họ và Tên và 1 trong 3 thông tin liên lạc (số điện thoại chính, số điện thoại phụ hoặc email)
-customer.fileNotSelected=Bạn chưa chọn file
 customer.emailInvalid=Email không đúng định dạng;
 customer.emailExists=Email đã tồn tại;