Merge branch 'master' of https://git.myitsol.com/hanv/service-campaign

pom.xml

@@ -162,6 +162,18 @@
             <version>2.1.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>net.javacrumbs.shedlock</groupId>
+            <artifactId>shedlock-spring</artifactId>
+            <version>2.2.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>net.javacrumbs.shedlock</groupId>
+            <artifactId>shedlock-provider-redis-spring</artifactId>
+            <version>2.2.0</version>
+        </dependency>
+
     </dependencies>
 
     <build>

src/main/java/com/viettel/campaign/job/CampaignJob.java

@@ -4,6 +4,7 @@ import com.viettel.campaign.model.ccms_full.*;
 import com.viettel.campaign.service.*;
 import com.viettel.campaign.utils.DateTimeUtil;
 import lombok.extern.slf4j.Slf4j;
+import net.javacrumbs.shedlock.core.SchedulerLock;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.text.SimpleDateFormat;
@@ -41,6 +42,7 @@ public class CampaignJob {
 
 //    @Scheduled(fixedRate = 5000)
 //    @Transactional( propagation = Propagation.REQUIRED)
+    @SchedulerLock(name = "testTimer", lockAtMostFor = 20*1000, lockAtLeastFor = 20*1000)
     public void process() {
         log.info(Thread.currentThread().getName() + " The Task executed at " + dateFormat.format(new Date()));
         List<ProcessConfig> list = processConfigService.findAll();

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

@@ -13,6 +13,9 @@ import java.util.List;
 
 @Repository
 public interface CampaignCfgRepository extends JpaRepository<CampaignCfg, Long> {
+    @Query("select c from CampaignCfg c where  c.companySiteId=:p_company_site_id and c.status = 1")
+    List<CampaignCfg> findByCampaignCompleteCodeId( @Param("p_company_site_id") Long p_company_site_id);
+
     @Query("select c from CampaignCfg c where c.campaignCompleteCodeId in (:p_ids) and c.companySiteId=:p_company_site_id and c.status = 1")
     List<CampaignCfg> findAllCampaignCfg(@Param("p_ids") List<Long> p_ids, @Param("p_company_site_id") Long p_company_site_id);
 

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

@@ -14,6 +14,9 @@ public interface CustomerListRepository extends JpaRepository<CustomerList, Long
 
     CustomerList findByCustomerListCode(String customerListCode);
 
+    @Query("select c from CustomerList c where c.customerListId in (:p_ids) and c.companySiteId=:p_company_site_id and c.status = 1")
+    List<CustomerList> findAllCustomerList(@Param("p_ids") List<Long> p_ids, @Param("p_company_site_id") Long p_company_site_id);
+
     @Modifying
     @Query("update CustomerList c set c.status = 0 where c.customerListId=:p_customer_list_id and c.companySiteId=:p_company_site_id")
     int deleteCustomerList(@Param("p_customer_list_id") Long p_customer_list_id, @Param("p_company_site_id") Long p_company_site_id);

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

@@ -4,10 +4,7 @@ import com.viettel.campaign.config.DataSourceQualify;
 import com.viettel.campaign.model.ccms_full.CampaignCustomer;
 import com.viettel.campaign.repository.ccms_full.CampaignCustomerRepository;
 import com.viettel.campaign.repository.ccms_full.CampaignRepositoryCustom;
-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.CampaignRequestDTO;
 import org.apache.logging.log4j.LogManager;
@@ -29,10 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Repository
 public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
@@ -52,6 +46,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
 
     @Override
     public ResultDTO search(CampaignRequestDTO requestDto) {
+        TimeZone tzClient = TimeZoneUtils.getZoneMinutes((long) requestDto.getTimezoneOffset());
         logger.info("Start search campaign::");
 
         ResultDTO result = new ResultDTO();
@@ -131,16 +126,16 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
                 sb.append(" AND a.STATUS IN (:p_statuses) ");
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getFromDateFr())) {
-                sb.append(" AND TO_DATE(a.START_TIME, 'DD-MM-RR') >= TO_DATE(:p_frDateFr, 'YYYYMMDD')");
+                sb.append(" AND a.START_TIME >= TO_DATE(:p_frDateFr, 'DD/MM/YYYY HH24:MI:SS')");
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getToDateFr())) {
-                sb.append(" AND TO_DATE(a.START_TIME, 'DD-MM-RR') <= TO_DATE(:p_toDateFr, 'YYYYMMDD')");
+                sb.append(" AND a.START_TIME <= TO_DATE(:p_toDateFr, 'DD/MM/YYYY HH24:MI:SS')");
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getFromDateTo())) {
-                sb.append(" AND TO_DATE(a.END_TIME, 'DD-MM-RR') >= TO_DATE(:p_frDateTo, 'YYYYMMDD')");
+                sb.append(" AND a.END_TIME >= TO_DATE(:p_frDateTo, 'DD/MM/YYYY HH24:MI:SS')");
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getToDateTo())) {
-                sb.append(" AND TO_DATE(a.END_TIME, 'DD-MM-RR') <= TO_DATE(:p_toDateTo, 'YYYYMMDD')");
+                sb.append(" AND a.END_TIME <= TO_DATE(:p_toDateTo, 'DD/MM/YYYY HH24:MI:SS')");
             }
             if (!DataUtil.isNullOrZero(requestDto.getNumOfCusFr())) {
                 sb.append(" AND a.CUSTOMER_NUMBER >= :p_cusNumFr");
@@ -185,16 +180,16 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
                 query.setParameterList("p_statuses", statuses);
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getFromDateFr())) {
-                query.setParameter("p_frDateFr", requestDto.getFromDateFr());
+                query.setParameter("p_frDateFr", TimeZoneUtils.toDateStringWithTimeZone(DateTimeUtil.parseDate("YYYYMMdd",requestDto.getFromDateFr()), tzClient));
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getFromDateTo())) {
-                query.setParameter("p_frDateTo", requestDto.getFromDateTo());
+                query.setParameter("p_frDateTo", TimeZoneUtils.toDateStringWithTimeZone(DateTimeUtil.parseDate("YYYYMMdd",requestDto.getFromDateTo()), tzClient));
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getToDateFr())) {
-                query.setParameter("p_toDateFr", requestDto.getToDateFr());
+                query.setParameter("p_toDateFr", TimeZoneUtils.toDateStringWithTimeZone(DateTimeUtil.parseDate("YYYYMMdd",requestDto.getToDateFr()), tzClient));
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getToDateTo())) {
-                query.setParameter("p_toDateTo", requestDto.getToDateTo());
+                query.setParameter("p_toDateTo", TimeZoneUtils.toDateStringWithTimeZone(DateTimeUtil.parseDate("YYYYMMdd",requestDto.getToDateTo()), tzClient));
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getTypes())) {
                 String[] types = requestDto.getTypes().split(",");
@@ -247,10 +242,18 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
                     query.setMaxResults(pageable.getPageSize());
                 }
                 List<CampaignDTO> data = query.list();
+                data.forEach(item -> {
+                    item.setStartTime(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getStartTime(),tzClient)));
+                    item.setEndTime(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getEndTime(),tzClient)));
+                });
                 Page<CampaignDTO> dataPage = new PageImpl<>(data, pageable, count);
                 result.setData(dataPage);
             } else {
                 List<CampaignDTO> dataExport = query.list();
+                dataExport.forEach(item -> {
+                    item.setStartTime(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getStartTime(),tzClient)));
+                    item.setEndTime(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getEndTime(),tzClient)));
+                });
                 result.setData(dataExport);
             }
             result.setErrorCode(Constants.ApiErrorCode.SUCCESS);

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

@@ -20,7 +20,7 @@ public interface CampaignCfgService {
 
     ResultDTO deleteList(CampaignCfgRequestDTO campaignCfgRequestDTO);
 
-    ResultDTO deleteById(Long id);
+    ResultDTO deleteById(CampaignCfgRequestDTO campaignCfgRequestDTO);
 
     ResultDTO findMaxValueCampaignCompleteCode(CampaignCfgDTO completeCodeDTO);
 

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

@@ -167,12 +167,6 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
         try {
             if (completeCodeDTO != null) {
 
-                // insert
-//                compCode = compCodeMapper.toPersistenceBean(completeCodeDTO);
-//                compCode = completeCodeRepository.save(compCode);
-//
-//                resultDTO.setErrorCode("0");
-//                resultDTO.setDescription("Complete Code: " + compCode.getCampaignCompleteCodeId() + " created!");
                 CampaignCfg cl = new CampaignCfg();
                 cl.setStatus((short) 1);
                 cl.setCreateBy(String.valueOf(userId));
@@ -241,14 +235,23 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
     @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO deleteCompleteCode(CampaignCfgRequestDTO completeCodeDTO) {
         ResultDTO resultDTO = new ResultDTO();
-
+        List<Long> listId = new ArrayList<>();
+        listId.add(completeCodeDTO.getCampaignCompleteCodeID());
         try {
             // delete
             if (completeCodeDTO != null) {
-                completeCodeRepository.deleteCampaignCompleteCodeBy(completeCodeDTO.getCampaignCompleteCodeID(), completeCodeDTO.getCompanySiteId());
+//                completeCodeRepository.deleteCampaignCompleteCodeBy(completeCodeDTO.getCampaignCompleteCodeID(), completeCodeDTO.getCompanySiteId());
+
+                if (completeCodeRepository.findAllCampaignCfg(listId, completeCodeDTO.getCompanySiteId()).size() > 0) {
+                    completeCodeRepository.deleteCampaignCompleteCodeBy(completeCodeDTO.getCampaignCompleteCodeID(), completeCodeDTO.getCompanySiteId());
+
+                    resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                    resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+                } else {
+                    resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+                    resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+                }
 
-                resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
-                resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
             } else {
                 resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
                 resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
@@ -256,6 +259,7 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
 
         } catch (Exception e) {
             // e.printStackTrace();
+            logger.error(e.getMessage(), e);
         }
 
         return resultDTO;
@@ -284,26 +288,36 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
             }
         } catch (Exception e) {
             // e.printStackTrace();
+            logger.error(e.getMessage(), e);
         }
         return resultDTO;
     }
 
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public ResultDTO deleteById(Long id) {
+    public ResultDTO deleteById(CampaignCfgRequestDTO completeCodeDTO) {
         ResultDTO result = new ResultDTO();
-
         try {
-            completeCodeRepository.deleteById(id);
-            result.setErrorCode(Constants.Status.ACTIVE_STR);
-            result.setDescription(Constants.Status.ACTIVE_STR);
+            if (completeCodeDTO != null) {
+                if (completeCodeRepository.findAllCampaignCfg(completeCodeDTO.getListId(), completeCodeDTO.getCompanySiteId()).size() > 0) {
+                    completeCodeRepository.deletedList(completeCodeDTO.getListId(), completeCodeDTO.getCompanySiteId());
+
+                    result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                    result.setDescription(Constants.ApiErrorDesc.SUCCESS);
+                } else {
+                    result.setErrorCode(Constants.ApiErrorCode.ERROR);
+                    result.setDescription(Constants.ApiErrorDesc.ERROR);
+                }
 
+            } else {
+                result.setErrorCode(Constants.ApiErrorCode.ERROR);
+                result.setDescription(Constants.ApiErrorDesc.ERROR);
+            }
         } catch (Exception e) {
-            result.setErrorCode("-1");
-            return result;
+            // e.printStackTrace();
+            logger.error(e.getMessage(), e);
         }
-        result.setErrorCode("0");
-        return result;
+        return  result;
     }
 
 

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

@@ -357,7 +357,7 @@ public class CampaignServiceImpl implements CampaignService {
                 entity.setUpdateBy(campaignDTO.getUpdateBy());
                 entity.setEndTime(campaignDTO.getEndTime());
 
-                campaignRepository.save(entity);
+                //campaignRepository.save(entity);
 
                 UserActionLogDTO userActionLog = new UserActionLogDTO();
                 userActionLog.setAgentId(null);
@@ -368,7 +368,7 @@ public class CampaignServiceImpl implements CampaignService {
                 userActionLog.setEndTime(null);
                 userActionLog.setObjectId(entity.getCampaignId());
                 userActionLog.setActionType((short) 6);
-                userActionLogRepository.insertToUserActionLog(userActionLog);
+                //userActionLogRepository.insertToUserActionLog(userActionLog);
                 resultDTO.setData(entity);
                 resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
                 resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);

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

@@ -69,6 +69,7 @@ public class ScenarioQuestionServiceImpl implements ScenarioQuestionService {
         ResultDTO resultDTO = new ResultDTO();
         List<ScenarioAnswerDTO> lstAnswers = new ArrayList<>();
         List<ScenarioAnswer> lstAnswersToInsert = new ArrayList<>();
+        scenarioQuestionDTO.setQuestion(scenarioQuestionDTO.getQuestion().trim());
         try {
             ScenarioQuestion scenarioQuestion = modelMapper.map(scenarioQuestionDTO, ScenarioQuestion.class);
 

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

@@ -7,10 +7,12 @@ public class Constants {
     public interface ApiErrorCode {
         String ERROR = "01";
         String SUCCESS = "00";
+        String DELETE_ERROR = "02";
     }
     public interface ApiErrorDesc {
         String ERROR = "ERROR";
         String SUCCESS = "SUCCESS";
+        String DELETE_ERROR = "DELETE_ERROR";
     }
     public interface FileType {
         String pdf = "pdf";

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

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.viettel.campaign.utils;
+
+import org.apache.log4j.Logger;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+
+/**
+ *
+ * @author phamky
+ */
+public class TimeZoneUtils {
+
+    private static Long getTimeZone(TimeZone tz) {
+        return TimeUnit.MILLISECONDS.toHours(tz.getRawOffset());
+    }
+
+    private static Long getTimeZoneToMinutes(TimeZone tz) {
+        return TimeUnit.MILLISECONDS.toMinutes(tz.getRawOffset());
+    }
+
+    public static String toQueryTimeZoneZero(Date date){
+        String dateStr = toDateStringWithTimeZoneZero(date);
+        return "to_date( '"+dateStr+"', 'DD/MM/YYYY HH24:MI:SS')";
+    }
+
+    public static String changeTimeZoneString(String dateStr, TimeZone tz){
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
+            Date date = sdf.parse(dateStr);
+            sdf.setTimeZone(tz);
+            return sdf.format(date);
+
+        } catch (ParseException ex) {
+        }
+        return "";
+    }
+
+    public static String changeTimeZoneStringPattern(String dateStr, TimeZone tz, String pattern){
+        try {
+            SimpleDateFormat sdf1 = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
+            Date date = sdf1.parse(dateStr);
+            SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+            sdf.setTimeZone(tz);
+            return sdf.format(date);
+
+        } catch (ParseException ex) {
+        }
+        return "";
+    }
+
+    public static String toDateStringWithTimeZoneZero(Date date){
+        TimeZone tz = getZone(0l);
+        return toDateStringWithTimeZone(date, tz);
+    }
+
+    public static String toDateStringWithTimeZonePattern(Date date, long tz, String pattern){
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        sdf.setTimeZone(getZone(tz));
+        return sdf.format(date);
+    }
+
+//    public static String toHourStringWithTimeZonePattern(Long hour, long tz){
+//        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+//        sdf.setTimeZone(getZone(tz));
+//        return sdf.format(date);
+//    }
+
+
+    public static String toDateStringWithTimeZonePattern(Date date, TimeZone tz, String pattern){
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        sdf.setTimeZone(tz);
+        return sdf.format(date);
+    }
+
+
+    public static String toDateStringWithTimeZone(Date date, TimeZone tz){
+        SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
+        sdf.setTimeZone(tz);
+        return sdf.format(date);
+    }
+
+    public static TimeZone getZone(Long timeZone){
+        if(timeZone == null){
+            //timezone is null, return default
+            return TimeZone.getDefault();
+        }
+        String[] ids = TimeZone.getAvailableIDs();
+        for (String id : ids) {
+            TimeZone tz = TimeZone.getTimeZone(id);
+            if(getTimeZone(tz).equals(timeZone)){
+                //zone need change
+                return tz;
+            }
+        }
+        return TimeZone.getDefault();
+    }
+
+    public static TimeZone getZoneMinutes(Long timeZone){
+        if(timeZone == null){
+            //timezone is null, return default
+            return TimeZone.getDefault();
+        }
+        String[] ids = TimeZone.getAvailableIDs();
+        for (String id : ids) {
+            TimeZone tz = TimeZone.getTimeZone(id);
+            if(getTimeZoneToMinutes(tz).equals(timeZone)){
+                //zone need change
+                return tz;
+            }
+        }
+        return TimeZone.getDefault();
+    }
+
+    public static Date changeTimeZone(Date date, Long timeZone){
+        if(timeZone == null){
+            //timezone is null, do not change timezone
+            return date;
+        }
+        String[] ids = TimeZone.getAvailableIDs();
+        for (String id : ids) {
+            TimeZone tz = TimeZone.getTimeZone(id);
+            if(getTimeZone(tz).equals(timeZone)){
+                //zone need change
+
+                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                df.setTimeZone(tz);
+                try {
+                    SimpleDateFormat df2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    Date newDate = df2.parse(df.format(date));
+                    System.out.println(df2.format(newDate));
+                    return newDate;
+                } catch (ParseException ex) {
+                }
+            }
+        }
+        return date;
+    }
+
+    public static void main(String args[]){
+        Date date = new Date();
+        System.out.println(changeTimeZone(date, -6l));
+        System.out.println(changeTimeZone(date, 0l));
+
+        System.out.println(getZone(0l));
+    }
+
+}

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

@@ -66,4 +66,7 @@ public class CampaignDTO extends BaseDTO {
     private String sessionId;
     private Long numOfInteractedCus;
     private Long numOfNotInteractedCus;
+
+    //timezone to get true date
+    private Double timezone;
 }

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

@@ -10,5 +10,5 @@ public class CampaignCfgRequestDTO {
     List<Long> listId;
     Long companySiteId;
     Long campaignCompleteCodeID;
-    String completeValue;
+
 }

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

@@ -12,4 +12,5 @@ public class SearchCustomerRequestDTO extends BaseDTO {
     String convertedDateFrom;
     String convertedDateTo;
     String companySiteId;
+    Integer timezoneOffset;
 }

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

@@ -106,9 +106,9 @@ public class CampaignCfgController {
 
     @PostMapping("/deleteById")
     @ResponseBody
-    public  ResultDTO deleteById(@RequestParam("id") Long id){
+    public  ResultDTO deleteById(@RequestBody @Valid CampaignCfgRequestDTO campaignCfgRequestDTO){
         ResultDTO resultDTO = new ResultDTO();
-        resultDTO = completeCodeService.deleteById(id);
+        resultDTO = completeCodeService.deleteById(campaignCfgRequestDTO);
         return  resultDTO;
 
     }

src/main/resources/i18n/language_en.properties

@@ -87,15 +87,13 @@ customer.cusType.vip = VIP
 customer.cusType.blacklist = Blacklist
 customer.yes = Yes
 customer.not = No
-customer.noData = Template empty
 customer.nameRequired = Full name required;
-customer.emailMax100=Email must less than 100 character;
 customer.invalidRecord=Invalid Record, required one more contact information;
 customer.onlyNumber=Phone contain number only;
-customer.importSuccess = Import Successful
-customer.importFailed = Import Failed
 customer.errorValidate = Error while validating
-customer.phoneMax50 = Mobile phone must less than 50 character;
+customer.phoneMax50=Mobile phone must less than 50 characters;
+customer.phone8to15=Mobile phone from 8 to 15 characters;
+customer.3phone=Max 3 mobile phone;
 customer.phoneExists = Mobile phone exists;
 customer.notMatch = not match regexp validation
 customer.notGreaterThan = not greater than

src/main/resources/i18n/language_vi.properties

@@ -89,15 +89,13 @@ customer.cusType.vip = VIP
 customer.cusType.blacklist = Blacklist
 customer.yes = Có
 customer.not = Không
-customer.noData = Template không có dữ liệu
 customer.nameRequired = Họ và tên không được để trống;
-customer.emailMax100=Email không được quá 100 kí tự;
 customer.invalidRecord=Bắt buộc nhập 1 trong 3 thông tin liên lạc(Số điện thoại chính, Số điện thoại phụ, Email);
 customer.onlyNumber=Số điện thoại chỉ được nhập số;
-customer.importSuccess = Import dữ liệu thành công
-customer.importFailed = Import dữ liệu thất bại
 customer.errorValidate = Validate dữ liệu lỗi
 customer.phoneMax50 = Số điện thoại không được quá 50 kí tự;
+customer.phone8to15=Số điện thoại chỉ được từ 8 đến 15 kí tự;
+customer.3phone=Tối đa chỉ được nhập 3 số điện thoại;
 customer.phoneExists = Số điện thoại chính đã tồn tại;
 customer.notMatch = không đúng định dạng
 customer.notGreaterThan = không được lớn hơn