phipd commit: get userSession

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

@@ -6,6 +6,7 @@ import com.viettel.campaign.web.dto.*;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.util.Date;
 import java.util.List;
@@ -32,7 +33,7 @@ public interface CustomerService {
 
     ResultDTO getAllCustomerList(int page, int pageSize, String sort, Long companySiteId);
 
-    ResultDTO createCustomerList(CustomerListDTO customerListDTO);
+    ResultDTO createCustomerList(CustomerListDTO customerListDTO, HttpServletRequest request);
 
     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,10 +579,14 @@ public class CustomerServiceImpl implements CustomerService {
 
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public ResultDTO createCustomerList(CustomerListDTO customerListDTO) {
+    public ResultDTO createCustomerList(CustomerListDTO customerListDTO, HttpServletRequest request) {
         ResultDTO resultDTO = new ResultDTO();
         CustomerListMapper customerListMapper = new CustomerListMapper();
         CustomerList customerList = new CustomerList();
+
+        String xAuthToken = request.getHeader("X-Auth-Token");
+        UserSession userSession = (UserSession) RedisUtil.getInstance().get(xAuthToken);
+        customerListDTO.setCreateBy(userSession.getUserName());
         try {
             if (customerListDTO != null) {
                 // insert

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

@@ -9,15 +9,13 @@ 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;
@@ -109,13 +107,13 @@ 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);
+            result = customerService.createCustomerList(customerListDTO, request);
             //LOGGER.info("Returning createCustomer:" + result.getErrorCode());
             //logUtil.endKpiLog(customerDTO, 0, result.getErrorCode(), result.getDetail(), CustomerController.class, customerDTO.getAgentProcess(), this.serverPort);
         } catch (Exception e) {