anhvd commit

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

 package com.viettel.campaign.filter;
 
-import com.viettel.campaign.utils.RedisUtil;
-import com.viettel.econtact.filter.UserSession;
-import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.*;
@@ -31,7 +28,7 @@ public class CorsFilter implements Filter {
 
         HttpServletRequest request = (HttpServletRequest) req;
 
-        chain.doFilter(req, resp);
+        chain.doFilter(req, response);
 
 //        if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
 //            chain.doFilter(req, resp);

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

@@ -421,6 +421,7 @@ public class CustomerServiceImpl implements CustomerService {
     }
 
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO getCustomerDetailById(Long companySiteId, Long customerListId, Long customerId) {
         ResultDTO resultDTO = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
@@ -880,6 +881,7 @@ public class CustomerServiceImpl implements CustomerService {
     }
 
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public List<CustomizeFields> getDynamicHeader(Long companySiteId) {
         LOGGER.info("------------------GET DYNAMIC HEADER-------------------");
         List<CustomizeFields> headerList;
@@ -893,10 +895,12 @@ public class CustomerServiceImpl implements CustomerService {
     }
 
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public Map<String, Object> readAndValidateCustomer(String path, List<CustomizeFields> dynamicHeader, UserSession userSession, Long customerListId) {
         LOGGER.info("------------READ AND VALIDATE--------------");
         Locale locale = new Locale("vi", "VN");
-        SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
+        DataFormatter dataFormat = new DataFormatter();
+        SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
         Map<String, Object> result = new HashMap<>();
         StringBuilder sb = new StringBuilder();
         boolean validateOk = false;
@@ -972,14 +976,7 @@ public class CustomerServiceImpl implements CustomerService {
                     for (int j = 0; j < row.getPhysicalNumberOfCells(); j++) {
                         Cell dataCell = dataRow.getCell(j);
                         if (dataCell != null) {
-                            switch (dataCell.getCellTypeEnum()) {
-                                case NUMERIC:
-                                    obj[j] = dataCell.getNumericCellValue();
-                                    break;
-                                default:
-                                    obj[j] = dataCell.getStringCellValue();
-                                    break;
-                            }
+                            obj[j] = dataFormat.formatCellValue(dataCell);
                         } else {
                             Cell headerCell = row.getCell(j);
                             if (headerCell.getStringCellValue().equals(BundleUtils.getLangString("customer.cusType", locale))) {
@@ -1016,9 +1013,12 @@ public class CustomerServiceImpl implements CustomerService {
                         && !rawDataList.get(i)[4].toString().trim().equals("")) {
                     String str = validatePhone(rawDataList.get(i)[2].toString().trim(), locale);
                     str.concat(validateLength(BundleUtils.getLangString("customer.secondPhone", locale).split("#")[0], rawDataList.get(i)[3].toString(), 50, locale));
-                    if (validateEmail(rawDataList.get(i)[4].toString().trim())) {
-                        str.concat(BundleUtils.getLangString("customer.emailMax50", locale));
+                    if (!validateEmail(rawDataList.get(i)[4].toString().trim())) {
+                        str.concat(BundleUtils.getLangString("customer.emailInvalid", locale));
+                    } else {
+                        str.concat(validateDuplicateEmail(rawDataList.get(i)[4].toString().trim(), locale));
                     }
+                    sb.append(validateLength(BundleUtils.getLangString("customer.email", locale).split("#")[0], rawDataList.get(i)[4].toString(), 50, locale));
                     sb.append(str);
                 } else {
                     sb.append(BundleUtils.getLangString("customer.invalidCustomer", locale));
@@ -1032,17 +1032,17 @@ public class CustomerServiceImpl implements CustomerService {
                 if (rawDataList.get(i).length > 8 && rawDataList.get(i)[8] != null) {
                     sb.append(validateLength(BundleUtils.getLangString("customer.description", locale).split("#")[0], rawDataList.get(i)[8].toString(), 2000, locale));
                 }
-                for (int j = 12; j < header.size(); j++) {
-                    if (rawDataList.get(i).length > j && rawDataList.get(i)[j] != null) {
-                        if (header.get(j).getType().equals("text")) {
-                            sb.append(validateDynamicLength(header.get(j).getTitle(), rawDataList.get(i)[j].toString(), header.get(j).getMinLength(), header.get(j).getMaxLength(), locale));
-                        } else if (header.get(j).getType().equals("date")) {
-                            sb.append(validateUsingRegexp(header.get(j).getTitle(), rawDataList.get(i)[j].toString(), header.get(j).getRegexpForValidation(), locale));
-                        } else if (header.get(j).getType().equals("number")) {
-                            sb.append(validateDynamicLength(header.get(j).getTitle(), rawDataList.get(i)[j].toString(), header.get(j).getMin(), header.get(j).getMax(), locale));
-                        }
-                    }
-                }
+//                for (int j = 12; j < header.size(); j++) {
+//                    if (rawDataList.get(i).length > j && rawDataList.get(i)[j] != null) {
+//                        if (header.get(j).getType().equals("text")) {
+//                            sb.append(validateDynamicLength(header.get(j).getTitle(), rawDataList.get(i)[j].toString(), header.get(j).getMinLength(), header.get(j).getMaxLength(), locale));
+//                        } else if (header.get(j).getType().equals("date")) {
+//                            sb.append(validateUsingRegexp(header.get(j).getTitle(), rawDataList.get(i)[j].toString(), header.get(j).getRegexpForValidation(), locale));
+//                        } else if (header.get(j).getType().equals("number")) {
+//                            sb.append(validateDynamicLength(header.get(j).getTitle(), rawDataList.get(i)[j].toString(), header.get(j).getMin(), header.get(j).getMax(), locale));
+//                        }
+//                    }
+//                }
                 Row dataRow = sheet.getRow(4 + i);
                 Cell resultCell = dataRow.createCell(row.getPhysicalNumberOfCells() - 1);
                 if (sb.length() > 0) {
@@ -1061,7 +1061,7 @@ public class CustomerServiceImpl implements CustomerService {
                 for (int i = 0; i < rawDataList.size(); i++) {
                     Customer c = new Customer();
                     c.setName(rawDataList.get(i)[1].toString());
-                    c.setSiteId(userSession.getCompanySiteId());
+                    c.setSiteId(userSession.getSiteId());
                     c.setCode(null);
                     c.setDescription(rawDataList.get(i)[8].toString());
                     c.setCompanyName(rawDataList.get(i)[7].toString());
@@ -1107,11 +1107,12 @@ public class CustomerServiceImpl implements CustomerService {
                     }
                     c.setIpccStatus("active");
                     Customer saved = customerRepository.save(c);
-                    CustomerContact cc = new CustomerContact();
-                    cc.setCustomerId(saved.getCustomerId());
                     if (rawDataList.get(i).length > 2 && rawDataList.get(i)[2] != null) {
                         String[] mainPhone = rawDataList.get(i)[2].toString().split(";");
                         for (int j = 0; j < mainPhone.length; j++) {
+                            CustomerContact cc = new CustomerContact();
+                            cc.setCustomerId(saved.getCustomerId());
+                            cc.setSiteId(userSession.getSiteId());
                             cc.setContactType((short) 5);
                             cc.setContact(mainPhone[j]);
                             cc.setIsDirectLine((short) 1);
@@ -1126,6 +1127,9 @@ public class CustomerServiceImpl implements CustomerService {
                     if (rawDataList.get(i).length > 3 && rawDataList.get(i)[3] != null) {
                         String[] subPhone = rawDataList.get(i)[3].toString().split(";");
                         for (int j = 0; j < subPhone.length; j++) {
+                            CustomerContact cc = new CustomerContact();
+                            cc.setCustomerId(saved.getCustomerId());
+                            cc.setSiteId(userSession.getSiteId());
                             cc.setContactType((short) 5);
                             cc.setContact(subPhone[j]);
                             cc.setIsDirectLine((short) 0);
@@ -1138,8 +1142,11 @@ public class CustomerServiceImpl implements CustomerService {
                         }
                     }
                     if (rawDataList.get(i).length > 4 && rawDataList.get(i)[4] != null) {
-                        String[] email = rawDataList.get(i)[3].toString().split(";");
+                        String[] email = rawDataList.get(i)[4].toString().split(";");
                         for (int j = 0; j < email.length; j++) {
+                            CustomerContact cc = new CustomerContact();
+                            cc.setCustomerId(saved.getCustomerId());
+                            cc.setSiteId(userSession.getSiteId());
                             cc.setContactType((short) 2);
                             cc.setContact(email[j]);
                             cc.setIsDirectLine((short) 1);
@@ -1156,7 +1163,7 @@ public class CustomerServiceImpl implements CustomerService {
                     for (int j = 0; j < dynamicHeader.size(); j++) {
                         cfo.setCustomizeFieldId(dynamicHeader.get(j).getCustomizeFieldId());
                         if (rawDataList.get(i).length > (12 + j) && rawDataList.get(i)[12 + j] != null) {
-                            switch (dynamicHeader.get(i).getType()) {
+                            switch (dynamicHeader.get(j).getType()) {
                                 case "combobox":
                                     CustomizeFieldOptionValue cfov =
                                             customizeFieldOptionValueRepository.findCustomizeFieldOptionValueByNameEqualsAndStatus(rawDataList.get(i)[12 + j].toString(), 1L);
@@ -1221,7 +1228,7 @@ public class CustomerServiceImpl implements CustomerService {
         if (str.length() > 50) {
             result = BundleUtils.getLangString("customer.phoneMax50", locale);
         }
-        for (int i = 0; i < str.length(); i++) {
+        for (int i = 0; i < arr.length; i++) {
             CustomerContact cc = customerContactRepository.findCustomerContactByContactEquals(arr[i]);
             if (cc != null) {
                 return result.concat(BundleUtils.getLangString("customer.phoneExists", locale));
@@ -1230,6 +1237,18 @@ public class CustomerServiceImpl implements CustomerService {
         return result;
     }
 
+    private String validateDuplicateEmail(String str, Locale locale) {
+        String result = "";
+        String[] arr = str.split(";");
+        for (int i = 0; i < arr.length; i++) {
+            CustomerContact cc = customerContactRepository.findCustomerContactByContactEquals(arr[i]);
+            if (cc != null) {
+                return result.concat(BundleUtils.getLangString("customer.emailExists", locale));
+            }
+        }
+        return result;
+    }
+
     private String validateUsingRegexp(String header, String data, String regexp, Locale locale) {
         if (data.matches(regexp)) {
             return header + " " + BundleUtils.getLangString("customer.notMatch", locale);
@@ -1251,8 +1270,14 @@ public class CustomerServiceImpl implements CustomerService {
     }
 
     private boolean validateEmail(String str) {
+        String[] arr = str.split(";");
         String regexp = "^[\\w-_\\.+]*[\\w-_\\.]\\@([\\w]+\\.)+[\\w]+[\\w]$";
-        return str.matches(regexp);
+        for (int i = 0; i < arr.length; i++) {
+            if (!arr[i].matches(regexp)) {
+                return false;
+            }
+        }
+        return true;
     }
 
     private boolean validateLetter(String str) {
@@ -1262,6 +1287,7 @@ public class CustomerServiceImpl implements CustomerService {
     //</editor-fold>
 
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public byte[] buildTemplate(Long companySiteId) {
         LOGGER.info("-----------BUILD TEMPLATE-----------");
         Locale locale = new Locale("vi", "VN");
@@ -1414,6 +1440,7 @@ public class CustomerServiceImpl implements CustomerService {
     }
 
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public List<CustomizeFieldObject> getCustomizeField(Long customerId) {
         List<CustomizeFieldObject> customizeFieldDTOList;
         try {
@@ -1494,6 +1521,7 @@ public class CustomerServiceImpl implements CustomerService {
     }
 
     @Override
+    @Transactional(DataSourceQualify.CCMS_FULL)
     public List<CustomerDTO> getIndividualCustomerInfo(CampaignCustomerDTO campaignCustomerDTO) {
         List<CustomerDTO> customerList;
         try {

src/main/java/com/viettel/campaign/utils/Config.java

 package com.viettel.campaign.utils;
 
-import com.viettel.security.PassTranformer;
 import org.apache.log4j.Logger;
 
 import java.io.File;
@@ -16,6 +15,7 @@ public class Config {
 
     public static final String APP_CONF_FILE_PATH = System.getProperty("user.dir") + File.separator + "etc" + File.separator + "app.conf";
     public static final String LOG_CONF_FILE_PATH = System.getProperty("user.dir") + File.separator + "etc" + File.separator + "log.conf";
+    public static final String EXCEL_DIR = System.getProperty("user.dir") + File.separator + "etc";
 
     public static String amcd_xmlrpc_url;
     public static int num_client_amcd_xmlprc;

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

@@ -5,6 +5,7 @@ import com.viettel.campaign.model.ccms_full.CustomizeFieldObject;
 import com.viettel.campaign.model.ccms_full.CustomizeFields;
 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.*;
@@ -187,12 +188,17 @@ public class CustomerController {
 
     @PostMapping(value = "/importFile")
     public ResponseEntity<?> importFile(@RequestParam("file") MultipartFile file,
-                                        @RequestParam("customerListId") Long customerListId,
-                                        @RequestHeader("X-Auth-Token") String authToken) {
+                                        @RequestParam("customerListId") String customerListId,
+                                        HttpServletRequest request) {
         LOGGER.info("------------IMPORT FILE TEMPLATE--------------");
         Locale locale = new Locale("vi", "VN");
         try {
-            UserSession userSession = (UserSession) RedisUtil.getInstance().get(authToken);
+            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);
             }
@@ -201,7 +207,7 @@ public class CustomerController {
             }
             String path = saveUploadFile(file);
             List<CustomizeFields> dynamicHeaders = customerService.getDynamicHeader(userSession.getCompanySiteId());
-            Map<String, Object> map = customerService.readAndValidateCustomer(path, dynamicHeaders, userSession, customerListId);
+            Map<String, Object> map = customerService.readAndValidateCustomer(path, dynamicHeaders, userSession, Long.parseLong(customerListId));
             File fileExport = (File) map.get("file");
             String message = (String) map.get("message");
             return ResponseEntity.ok()
@@ -239,11 +245,13 @@ public class CustomerController {
             String currentTime = new SimpleDateFormat("yyyy_MM_dd_hh_mm_ss").format(new Date());
             String fileName = FilenameUtils.getBaseName(file.getOriginalFilename()) + "_" + currentTime + "." + FilenameUtils.getExtension(file.getOriginalFilename());
             byte[] content = file.getBytes();
-            File uploadFolder = new File(BundleUtils.getGlobalConfig("import.uploadFolder"));
+//            File uploadFolder = new File(BundleUtils.getGlobalConfig("import.uploadFolder"));
+            File uploadFolder = new File(Config.EXCEL_DIR);
             if (!uploadFolder.exists()) {
                 uploadFolder.mkdir();
             }
-            Path path = Paths.get(BundleUtils.getGlobalConfig("import.uploadFolder"), fileName);
+//            Path path = Paths.get(BundleUtils.getGlobalConfig("import.uploadFolder"), fileName);
+            Path path = Paths.get(Config.EXCEL_DIR, fileName);
             Files.write(path, content);
             return path.toString();
         } catch (Exception e) {

src/main/resources/application.yml

@@ -11,6 +11,11 @@ spring:
       ddl-auto: none
       naming:
         physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
+  servlet:
+    multipart:
+      enabled: true
+      max-file-size: 3MB
+      max-request-size: 3MB
 #  kafka:
 #    consumer:
 #      bootstrap-servers: 192.168.1.201:9092
@@ -40,4 +45,3 @@ datasource-property:
 
 
 
-