Merge branch 'master' into tubn

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

@@ -72,8 +72,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             sb.append("    a.CAMPAIGN_TYPE campaignType,");
             sb.append("    (SELECT PAR_NAME FROM AP_PARAM WHERE STATUS = 1 AND PAR_TYPE = 'CAMPAIGN_TYPE' AND PAR_VALUE = a.CAMPAIGN_TYPE) campaignTypeName,");
             sb.append("    a.CHANEL chanel,");
-            sb.append("    a.START_TIME startTime,");
-            sb.append("    a.END_TIME endTime,");
+            sb.append("    (a.START_TIME + (:p_timezone_offset / 60)/24) startTime,");
+            sb.append("    (a.END_TIME + (:p_timezone_offset / 60)/24) endTime,");
             sb.append("    a.CUSTOMER_NUMBER customerNumber,");
             sb.append("    a.STATUS status,");
             sb.append("    a.CUSTOMER_NUMBER cusNum,");
@@ -175,6 +175,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
 
             query.setParameter("p_company_site_id", requestDto.getCompanySiteId());
 
+            query.setParameter("p_timezone_offset", requestDto.getTimezoneOffset());
+
             if (!DataUtil.isNullOrEmpty(requestDto.getStatuses())) {
                 String[] statuses = requestDto.getStatuses().split(",");
                 query.setParameterList("p_statuses", statuses);

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

@@ -25,7 +25,7 @@ public interface CampaignService {
 
     Campaign updateProcess(Campaign c);
 
-    ResultDTO findByCampaignId(Long campaignId);
+    ResultDTO findByCampaignId(Long campaignId, Integer offSet);
 
     ResultDTO addNewCampaign(CampaignDTO campaignDTO);
 

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

@@ -20,6 +20,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 //import com.viettel.campaign.model.UserActionLog;
@@ -104,11 +106,13 @@ public class CampaignServiceImpl implements CampaignService {
 
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public ResultDTO findByCampaignId(Long campaignId) {
+    public ResultDTO findByCampaignId(Long campaignId, Integer offSet) {
         ResultDTO result = new ResultDTO();
         Campaign campaign = campaignRepository.findByCampaignId(campaignId);
 
         if (campaign != null) {
+            campaign.setStartTime(DateTimeUtil.addHoursToJavaUtilDate(campaign.getStartTime(), offSet/60) );
+            campaign.setEndTime(DateTimeUtil.addHoursToJavaUtilDate(campaign.getEndTime(), offSet/60));
             result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             result.setDescription(Constants.ApiErrorDesc.SUCCESS);
             result.setData(campaign);
@@ -127,6 +131,9 @@ public class CampaignServiceImpl implements CampaignService {
         ResultDTO resultDTO = new ResultDTO();
         campaignDTO.setCampaignName(campaignDTO.getCampaignName().trim());
         campaignDTO.setContent(campaignDTO.getContent().trim());
+        campaignDTO.setStartTime(TimeZoneUtils.changeTimeZone(campaignDTO.getStartTime(), 0L));
+        campaignDTO.setEndTime(TimeZoneUtils.changeTimeZone(campaignDTO.getEndTime(), 0L));
+        campaignDTO.setCreateTime(new Date());
         Campaign campaign = modelMapper.map(campaignDTO, Campaign.class);
         Long campaignId;
         List<TimeZoneDialModeDTO> timeZoneDialModes = new ArrayList<>();
@@ -353,7 +360,7 @@ public class CampaignServiceImpl implements CampaignService {
                 entity.setStatus(campaignDTO.getStatus().longValue());
                 entity.setUpdateTime(new Date());
                 entity.setUpdateBy(campaignDTO.getUpdateBy());
-                entity.setEndTime(campaignDTO.getEndTime());
+                entity.setEndTime(TimeZoneUtils.changeTimeZone(campaignDTO.getEndTime(), 0L));
 
                 //campaignRepository.save(entity);
 
@@ -391,8 +398,8 @@ public class CampaignServiceImpl implements CampaignService {
         campaignEntity.setCampaignCode(dto.getCampaignCode());
         campaignEntity.setContent(dto.getContent());
         campaignEntity.setCustomerNumber(dto.getCustomerNumber());
-        campaignEntity.setStartTime(dto.getStartTime());
-        campaignEntity.setEndTime(dto.getEndTime());
+        campaignEntity.setStartTime(TimeZoneUtils.changeTimeZone(dto.getStartTime(), 0L));
+        campaignEntity.setEndTime(TimeZoneUtils.changeTimeZone(dto.getEndTime(), 0L));
         campaignEntity.setMaxRecall(dto.getMaxRecall());
         campaignEntity.setRecallType(dto.getRecallType());
         campaignEntity.setRecallDuration(dto.getRecallDuration());

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

@@ -598,7 +598,7 @@ public class CustomerServiceImpl implements CustomerService {
                     } else if (validateNumberOnly(rawDataList.get(i)[headerMap.get(BundleUtils.getLangString("customer.mainPhone", locale).split("#")[0])].toString().trim())) {
                         sb.append(validateExistPhone(rawDataList.get(i)[headerMap.get(BundleUtils.getLangString("customer.mainPhone", locale).split("#")[0])].toString().trim(), locale, true));
                     } else {
-                        sb.append(BundleUtils.getLangString("customer.onlyNumber", locale));
+//                        sb.append(BundleUtils.getLangString("customer.onlyNumber", locale));
                     }
                 }
                 if (rawDataList.get(i).length > headerMap.get(BundleUtils.getLangString("customer.secondPhone", locale).split("#")[0]) && (rawDataList.get(i)[headerMap.get(BundleUtils.getLangString("customer.secondPhone", locale).split("#")[0])] == null || rawDataList.get(i)[headerMap.get(BundleUtils.getLangString("customer.secondPhone", locale).split("#")[0])].toString().trim().equals(""))) {
@@ -610,7 +610,7 @@ public class CustomerServiceImpl implements CustomerService {
                     } else if (validateNumberOnly(rawDataList.get(i)[headerMap.get(BundleUtils.getLangString("customer.secondPhone", locale).split("#")[0])].toString().trim())) {
                         sb.append(validateExistPhone(rawDataList.get(i)[headerMap.get(BundleUtils.getLangString("customer.secondPhone", locale).split("#")[0])].toString(), locale, false));
                     } else {
-                        sb.append(BundleUtils.getLangString("customer.onlyNumber", locale));
+//                        sb.append(BundleUtils.getLangString("customer.onlyNumber", locale));
                     }
                 }
                 if (rawDataList.get(i).length > headerMap.get(BundleUtils.getLangString("customer.email", locale).split("#")[0])

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

@@ -2,11 +2,13 @@ package com.viettel.campaign.utils;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
+import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.quartz.CronExpression;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
 import java.util.concurrent.atomic.AtomicReference;
@@ -126,4 +128,11 @@ public final class DateTimeUtil {
 
         return isOk;
     }
+
+    public static Date addHoursToJavaUtilDate(Date date, int hours) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.HOUR_OF_DAY, hours);
+        return calendar.getTime();
+    }
 }

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

@@ -149,6 +149,11 @@ public class TimeZoneUtils {
         System.out.println(changeTimeZone(date, 0l));
 
         System.out.println(getZone(0l));
+
+
+        TimeZone tzClient = TimeZoneUtils.getZoneMinutes((long) 420);
+
+        System.out.println(tzClient);
     }
 
 }

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

@@ -51,8 +51,8 @@ public class CampaignController {
 
     @GetMapping("/findByCampaignId")
     @ResponseBody
-    public ResponseEntity findByCampaignId(@RequestParam("campaignId") Long campaignId) {
-        ResultDTO result = campaignService.findByCampaignId(campaignId);
+    public ResponseEntity findByCampaignId(@RequestParam("campaignId") Long campaignId, @RequestParam("offSet") Integer offSet) {
+        ResultDTO result = campaignService.findByCampaignId(campaignId, offSet);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }