anhvd commit merge code

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

@@ -31,27 +31,27 @@ public class CorsFilter implements Filter {
 
         HttpServletRequest request = (HttpServletRequest) req;
 
-        chain.doFilter(req, resp);
-
-//        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.");
-//        }
+//        chain.doFilter(req, resp);
+
+        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/service/CustomerService.java

@@ -32,7 +32,7 @@ public interface CustomerService {
 
     ResultDTO getAllCustomerList(int page, int pageSize, String sort, Long companySiteId);
 
-    ResultDTO createCustomerList(CustomerListDTO customerListDTO);
+    ResultDTO createCustomerList(CustomerListDTO customerListDTO, String userName);
 
     ResultDTO updateCustomerList(CustomerListDTO customerListDTO);
 

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

@@ -8,17 +8,16 @@ import com.viettel.campaign.model.ccms_full.CustomerContact;
 import com.viettel.campaign.model.ccms_full.CustomerList;
 import com.viettel.campaign.repository.ccms_full.*;
 import com.viettel.campaign.service.CustomerService;
-import com.viettel.campaign.utils.Constants;
-import com.viettel.campaign.utils.DataUtil;
-import com.viettel.campaign.utils.HibernateUtil;
-import com.viettel.campaign.utils.SQLBuilder;
+import com.viettel.campaign.utils.*;
 import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CustomerDetailRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
+import com.viettel.econtact.filter.UserSession;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.eclipse.jetty.client.HttpRequest;
 import org.hibernate.SQLQuery;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
@@ -39,6 +38,7 @@ import org.springframework.util.ResourceUtils;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
+import javax.servlet.http.HttpServletRequest;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.util.*;
@@ -579,15 +579,18 @@ public class CustomerServiceImpl implements CustomerService {
 
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public ResultDTO createCustomerList(CustomerListDTO customerListDTO) {
+    public ResultDTO createCustomerList(CustomerListDTO customerListDTO, String userName) {
         ResultDTO resultDTO = new ResultDTO();
         CustomerListMapper customerListMapper = new CustomerListMapper();
         CustomerList customerList = new CustomerList();
+
         try {
             if (customerListDTO != null) {
                 // insert
                 CustomerList findCustomer = customerListRepository.findByCustomerListCode(customerListDTO.getCustomerListCode());
                 if (findCustomer == null) {
+                    customerListDTO.setCreateBy(userName);
+
                     customerList = customerListMapper.toPersistenceBean(customerListDTO);
                     customerListRepository.save(customerList);
 

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

 package com.viettel.campaign.web.rest;
 
+import com.viettel.campaign.utils.RedisUtil;
 import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.service.CustomerService;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
+import com.viettel.econtact.filter.UserSession;
 import org.apache.log4j.Logger;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 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;
+import org.springframework.http.*;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.io.File;
 import java.nio.file.Files;
@@ -59,18 +59,7 @@ public class CustomerController {
     @ResponseBody
     public ResultDTO createCustomer(@RequestBody @Valid CustomerDTO customerDTO) {
         ResultDTO result = new ResultDTO();
-        //LogUtil logUtil = new LogUtil();
-        //logUtil.initKpiLog("createCust");
-        try {
-            //LOGGER.info("Returning createCustomer: start");
-            result = customerService.createCustomer(customerDTO);
-            //LOGGER.info("Returning createCustomer:" + result.getErrorCode());
-            //logUtil.endKpiLog(customerDTO, 0, result.getErrorCode(), result.getDetail(), CustomerController.class, customerDTO.getAgentProcess(), this.serverPort);
-        } catch (Exception e) {
-            result.setErrorCode("-1");
-            LOGGER.error(e);
-            //logUtil.endKpiLog(customerDTO, 1, result.getErrorCode(), e.getMessage(), CustomerController.class, customerDTO.getAgentProcess(), this.serverPort);
-        }
+        result = customerService.createCustomer(customerDTO);
         return result;
     }
 
@@ -109,40 +98,21 @@ public class CustomerController {
 
     @PostMapping("/createCustomerList")
     @ResponseBody
-    public ResultDTO createCustomerList(@RequestBody @Valid CustomerListDTO customerListDTO) {
+    public ResultDTO createCustomerList(@RequestBody @Valid CustomerListDTO customerListDTO, HttpServletRequest request) {
         ResultDTO result = new ResultDTO();
-        //LogUtil logUtil = new LogUtil();
-        //logUtil.initKpiLog("createCust")
-        try {
-            //LOGGER.info("Returning createCustomer: start");
-            result = customerService.createCustomerList(customerListDTO);
-            //LOGGER.info("Returning createCustomer:" + result.getErrorCode());
-            //logUtil.endKpiLog(customerDTO, 0, result.getErrorCode(), result.getDetail(), CustomerController.class, customerDTO.getAgentProcess(), this.serverPort);
-        } catch (Exception e) {
-            result.setErrorCode("-1");
-//            LOGGER.error(e);
-            //logUtil.endKpiLog(customerDTO, 1, result.getErrorCode(), e.getMessage(), CustomerController.class, customerDTO.getAgentProcess(), this.serverPort);
-        }
+
+        String xAuthToken = request.getHeader("X-Auth-Token");
+        UserSession userSession = (UserSession) RedisUtil.getInstance().get(xAuthToken);
+
+        result = customerService.createCustomerList(customerListDTO, userSession.getUserName());
         return result;
-//        return new ResponseEntity<>("", HttpStatus.OK);
     }
 
     @PostMapping("/updateCustomerList")
     @ResponseBody
     public ResultDTO updateCustomerList(@RequestBody @Valid CustomerListDTO customerListDTO) {
         ResultDTO result = new ResultDTO();
-        //LogUtil logUtil = new LogUtil();
-        //logUtil.initKpiLog("createCust");
-        try {
-            //LOGGER.info("Returning createCustomer: start");
-            result = customerService.updateCustomerList(customerListDTO);
-            //LOGGER.info("Returning createCustomer:" + result.getErrorCode());
-            //logUtil.endKpiLog(customerDTO, 0, result.getErrorCode(), result.getDetail(), CustomerController.class, customerDTO.getAgentProcess(), this.serverPort);
-        } catch (Exception e) {
-            result.setErrorCode("-1");
-//            LOGGER.error(e);
-            //logUtil.endKpiLog(customerDTO, 1, result.getErrorCode(), e.getMessage(), CustomerController.class, customerDTO.getAgentProcess(), this.serverPort);
-        }
+        result = customerService.updateCustomerList(customerListDTO);
         return result;
     }