Merge remote-tracking branch 'origin/master'

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/CampaignAgentRepository.java

@@ -18,7 +18,9 @@ public interface CampaignAgentRepository extends JpaRepository<CampaignAgent, Lo
     @Query(value = "SELECT campaign_agent_seq.nextval FROM DUAL", nativeQuery = true)
     Long getNextSeqId();
 
-    List<CampaignAgent> findByCampaignIdAndAgentId(Long campaignId, Long agentId);
+    CampaignAgent findByCampaignIdAndAgentId(Long campaignId, Long agentId);
+
+    List<CampaignAgent> findByAgentId(Long agentId);
 
     @Modifying
     @Query("delete from CampaignAgent c where c.campaignAgentId in (:p_campaign_agent_id)")

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

@@ -460,6 +460,9 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
     @Transactional(DataSourceQualify.CCMS_FULL)
     public List<CampaignDTO> searchCampaignExecute(CampaignRequestDTO campaignRequestDto, Pageable pageable) {
         List<CampaignDTO> result = new ArrayList<>();
+        SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
+        Session session = null;
+
         StringBuilder expression = new StringBuilder()
                 .append(" SELECT C.CAMPAIGN_CODE, C.CAMPAIGN_NAME, C.CONTENT, C.START_TIME, C.END_TIME, C.STATUS, CA.STATUS AS AGENT_STATUS, C.CAMPAIGN_ID ")
                 .append(" FROM CAMPAIGN C INNER JOIN CAMPAIGN_AGENT CA ON C.CAMPAIGN_ID = CA.CAMPAIGN_ID ")
@@ -506,12 +509,15 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
         }
 
         try {
-            Query query = entityManager.createNativeQuery(expression.toString());
+            session = sessionFactory.openSession();
+            session.beginTransaction();
+
+            SQLQuery query = session.createSQLQuery(expression.toString());
             query.setParameter("pAgentId", Long.parseLong(campaignRequestDto.getAgentId()));
 
-            if (!DataUtil.isNullOrEmpty(campaignRequestDto.getCampaignCode())) {
+            if (!DataUtil.isNullOrEmpty(campaignRequestDto.getCampaignCode()) && !DataUtil.isNullOrEmpty(campaignRequestDto.getCampaignCode().trim())) {
                 String[] lstCode = campaignRequestDto.getCampaignCode().split(",");
-                query.setParameter("pCampaignCode", lstCode);
+                query.setParameterList("pCampaignCode", lstCode);
             }
 
             if (!DataUtil.isNullOrEmpty(campaignRequestDto.getCampaignName())) {
@@ -557,9 +563,7 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
                 query.setMaxResults(pageable.getPageSize());
             }
 
-            List<Object[]> data = query.getResultList();
-            //TimeZoneDialMode zoneDialMode = zoneDialModeRepository.findDialModeAtCurrent(Long.parseLong(campaignRequestDto.getCampaignId()), Long.parseLong(campaignRequestDto.getCompanySiteId()));
-            //TimeRangeDialMode rangeDialMode = rangeDialModeRepository.findDialModeAtCurrent(Long.parseLong(campaignRequestDto.getCampaignId()), Long.parseLong(campaignRequestDto.getCompanySiteId()));
+            List<Object[]> data = query.list();
 
             for (Object[] obj : data) {
                 CampaignDTO item = new CampaignDTO();
@@ -580,7 +584,11 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
 
             return result;
         } catch (Exception e) {
-            // e.printStackTrace();
+            e.printStackTrace();
+        } finally {
+            if (null != session) {
+                session.close();
+            }
         }
 
         return result;

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/CampaignExecuteService.java

@@ -20,7 +20,7 @@ public interface CampaignExecuteService {
 
     XSSFWorkbook exportInteractiveResult(CampaignRequestDTO dto) throws IOException;
 
-    ResultDTO searchCampaignExecute(CampaignRequestDTO requestDto, String xAuthToken);
+    ResultDTO searchCampaignExecute(CampaignRequestDTO requestDto);
 
     ResultDTO checkExecuteCampaign(CampaignRequestDTO requestDto);
 
@@ -36,6 +36,8 @@ public interface CampaignExecuteService {
 
     ResultDTO getAgentLogout(CampaignRequestDTO dto);
 
+    ResultDTO getLogoutContactResult(ReceiveCustLogDTO dto);
+
     ResultDTO updateContactCustResult(ContactCustResultDTO dto, UserSession userSession);
 
     ResultDTO draftAtTen(ContactCustResultDTO dto, UserSession userSession);
@@ -54,7 +56,7 @@ public interface CampaignExecuteService {
 
     ResultDTO updateListContactQuestResult(ContactQuestResultDTO dto);
 
-    String getDialModeAtCurrent(Long campaignId, Long companySiteId);
+    String getDialModeAtCurrent(Long companySiteId, Long campaignId);
 
     ResultDTO getContactCustResultById(Long contactCustResultId);
 

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

@@ -261,31 +261,43 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     //</editor-fold: hungtt>
 
     @Override
-    public ResultDTO searchCampaignExecute(CampaignRequestDTO requestDto, String xAuthToken) {
+    public ResultDTO searchCampaignExecute(CampaignRequestDTO requestDto) {
         ResultDTO result = new ResultDTO();
         Map data = new HashMap();
-        UserSession userSession = (UserSession) RedisUtil.getInstance().get(xAuthToken);
+        String campaignSystemStatus = "";
+        String campaignExecuting = "";
 
+        try {
             Integer count = campaignExecuteRepository.searchCampaignExecute(requestDto, null).size();
 
             if (count > 0) {
                 result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
                 result.setDescription(Constants.ApiErrorDesc.SUCCESS);
                 result.setTotalRow(count);
-            result.setListData(campaignExecuteRepository.searchCampaignExecute(requestDto, SQLBuilder.buildPageable(requestDto)));
+                List<CampaignDTO> campaignList = campaignExecuteRepository.searchCampaignExecute(requestDto, SQLBuilder.buildPageable(requestDto));
+                result.setListData(campaignList);
 
                 Agents agents = agentsRepository.findByAgentId(requestDto.getAgentId());
-            //TimeZoneDialMode zoneDialMode = zoneDialModeRepository.findDialModeAtCurrent(Long.parseLong(requestDto.getCampaignId()), Long.parseLong(requestDto.getCompanySiteId()));
-            //TimeRangeDialMode rangeDialMode = rangeDialModeRepository.findDialModeAtCurrent(Long.parseLong(requestDto.getCampaignId()), Long.parseLong(requestDto.getCompanySiteId()));
-
-            if (agents.getUserStatus() != null && agents.getCampaignSystemStatus() != null) {
-                if (agents.getUserStatus().equalsIgnoreCase("CALLOUT") && agents.getCampaignSystemStatus().equalsIgnoreCase("AVAILABLE")) {
-                    //if (zoneDialMode != null && zoneDialMode.getDialMode().equals(0) || rangeDialMode != null && rangeDialMode.getDialMode().equals(0))
-                    data.put("dialModeManual", "1");
+                if (agents.getCampaignSystemStatus() != null && agents.getCampaignSystemStatus().equalsIgnoreCase("AVAILABLE")) {
+                    campaignSystemStatus = "1";
+                    for (CampaignDTO item : campaignList) {
+                        if (item.getStatus() == 2 && item.getAgentStatus() == 1) {
+                            campaignExecuting = item.getCampaignId().toString();
+                            break;
                         }
                     }
+                }
+                data.put("campaignSystemStatus", campaignSystemStatus);
+                data.put("campaignExecuting", campaignExecuting);
                 result.setData(data);
             } else {
+                result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                result.setDescription(Constants.ApiErrorDesc.SUCCESS);
+                data.put("dialModeManual", campaignSystemStatus);
+                data.put("campaignExecuting", campaignExecuting);
+                result.setData(data);
+            }
+        } catch (Exception e) {
             result.setErrorCode(Constants.ApiErrorCode.ERROR);
             result.setDescription(Constants.ApiErrorDesc.ERROR);
         }
@@ -298,7 +310,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
         ResultDTO result = new ResultDTO();
 
         try {
-            String dialMode = getDialModeAtCurrent(Long.parseLong(requestDto.getCampaignId()), Long.parseLong(requestDto.getCompanySiteId()));
+            String dialMode = getDialModeAtCurrent(Long.parseLong(requestDto.getCompanySiteId()), Long.parseLong(requestDto.getCampaignId()));
             VSAUsers vsa = vsaUsersRepository.findByUserId(Long.parseLong(requestDto.getAgentId()));
             AgentStatusStat ass = agentStatusStatRepository.findByKzUserIdAndCurrentStatusNotIn(vsa.getUserKazooId(), Arrays.asList("logged_out", "campaign"));
             if (ass != null) {
@@ -325,6 +337,14 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
         ResultDTO result = new ResultDTO();
 
         try {
+            if (requestDto.getType() == 2) {
+                List<CampaignAgent> ca = campaignAgentRepository.findByAgentId(Long.parseLong(requestDto.getAgentId()));
+                for (CampaignAgent item: ca) {
+                    item.setStatus(0);
+                }
+                ca = campaignAgentRepository.saveAll(ca);
+            }
+
             // update acd_full.agents table
             Agents agents = agentsRepository.findByAgentId(requestDto.getAgentId());
             agents.setAgentId(requestDto.getAgentId());
@@ -334,11 +354,9 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
             Agents a1 = agentsRepository.save(agents);
 
             // update ccms_full.campaign_agent table
-            List<CampaignAgent> ca = campaignAgentRepository.findByCampaignIdAndAgentId(Long.parseLong(requestDto.getCampaignId()), Long.parseLong(requestDto.getAgentId()));
-            for (CampaignAgent item : ca) {
-                item.setStatus(1);
-            }
-            List<CampaignAgent> ca1 = campaignAgentRepository.saveAll(ca);
+            CampaignAgent ca = campaignAgentRepository.findByCampaignIdAndAgentId(Long.parseLong(requestDto.getCampaignId()), Long.parseLong(requestDto.getAgentId()));
+            ca.setStatus(1);
+            ca = campaignAgentRepository.save(ca);
 
             result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             result.setDescription(Constants.ApiErrorDesc.SUCCESS);
@@ -542,11 +560,31 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
         try {
             agentsRepository.updateAgentLogoutFromCampaign(dto.getAgentId(), "LOGOUT");
             // update ccms_full.campaign_agent table
-            List<CampaignAgent> ca = campaignAgentRepository.findByCampaignIdAndAgentId(Long.parseLong(dto.getCampaignId()), Long.parseLong(dto.getAgentId()));
-            for (CampaignAgent item : ca) {
-                item.setStatus(1);
+            CampaignAgent ca = campaignAgentRepository.findByCampaignIdAndAgentId(Long.parseLong(dto.getCampaignId()), Long.parseLong(dto.getAgentId()));
+            ca.setStatus(0);
+            ca = campaignAgentRepository.save(ca);
+
+            result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            result.setDescription(Constants.ApiErrorDesc.SUCCESS);
+        } catch (Exception e) {
+            // e.printStackTrace();
+            result.setErrorCode(Constants.ApiErrorCode.ERROR);
+            result.setDescription(Constants.ApiErrorDesc.ERROR);
         }
-            List<CampaignAgent> ca1 = campaignAgentRepository.saveAll(ca);
+
+        return result;
+    }
+
+    @Override
+    public ResultDTO getLogoutContactResult(ReceiveCustLogDTO dto) {
+        ResultDTO result = new ResultDTO();
+
+        try {
+            agentsRepository.updateAgentLogoutFromCampaign(dto.getAgentId().toString(), "AVAILABLE");
+            // update receive customer log
+            ReceiveCustLog rcl = custLogRepository.getOne(dto.getReceiveCustLogId());
+            rcl.setEndTime(new Date());
+            rcl = custLogRepository.save(rcl);
 
             result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             result.setDescription(Constants.ApiErrorDesc.SUCCESS);
@@ -840,7 +878,7 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     }
 
     @Override
-    public String getDialModeAtCurrent(Long campaignId, Long companySiteId) {
+    public String getDialModeAtCurrent(Long companySiteId, Long campaignId) {
         // 0: manual, 1- Preview, 2-Progressive, 3-Super Progressive, 4- Predictive
         try {
             TimeRangeDialMode lstTimeRange = rangeDialModeRepository.findDialModeAtCurrent(companySiteId, campaignId);

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/CustomerServiceImpl.java

@@ -774,6 +774,7 @@ public class CustomerServiceImpl implements CustomerService {
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
     public ResultDTO searchCustomerList(SearchCustomerRequestDTO searchCustomerRequestDTO) {
+        TimeZone tzClient = TimeZoneUtils.getZoneMinutes((long) searchCustomerRequestDTO.getTimezoneOffset());
         ResultDTO resultDTO = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
@@ -814,7 +815,7 @@ public class CustomerServiceImpl implements CustomerService {
             sb.append("  AND a.STATUS = 1");
             sb.append("  AND a.COMPANY_SITE_ID = :p_company_site_id");
 
-            sb.append(" AND to_date(CREATE_AT, 'DD-MM-RR') >= to_date(:p_date_from, 'YYYYMMDD') AND to_date(CREATE_AT, 'DD-MM-RR') <= to_date(:p_date_to, 'YYYYMMDD')");
+            sb.append(" AND CREATE_AT >= to_date(:p_date_from, 'DD/MM/YYYY HH24:MI:SS') AND CREATE_AT <= to_date(:p_date_to, 'DD/MM/YYYY HH24:MI:SS')");
 
             if (!DataUtil.isNullOrEmpty(searchCustomerRequestDTO.getCustomerListCode())) {
                 sb.append(" AND UPPER(CUSTOMER_LIST_CODE) LIKE UPPER(:p_list_code)");
@@ -828,8 +829,8 @@ public class CustomerServiceImpl implements CustomerService {
             SQLQuery query = session.createSQLQuery(sb.toString());
 
             query.setParameter("p_company_site_id", searchCustomerRequestDTO.getCompanySiteId());
-            query.setParameter("p_date_from", searchCustomerRequestDTO.getConvertedDateFrom());
-            query.setParameter("p_date_to", searchCustomerRequestDTO.getConvertedDateTo());
+            query.setParameter("p_date_from", TimeZoneUtils.toDateStringWithTimeZone(DateTimeUtil.parseDate("YYYYMMdd",searchCustomerRequestDTO.getConvertedDateFrom()), tzClient));
+            query.setParameter("p_date_to", TimeZoneUtils.toDateStringWithTimeZone(DateTimeUtil.parseDate("YYYYMMdd",searchCustomerRequestDTO.getConvertedDateTo()), tzClient));
 
             if (!DataUtil.isNullOrEmpty(searchCustomerRequestDTO.getCustomerListCode())) {
                 query.setParameter("p_list_code", "%" +
@@ -877,6 +878,10 @@ public class CustomerServiceImpl implements CustomerService {
 
             List<CustomerListDTO> data = query.list();
             Page<CustomerListDTO> dataPage = new PageImpl<>(data, pageable, count);
+            dataPage.forEach(item -> {
+                item.setCreateAt(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getCreateAt(),tzClient)));
+                item.setUpdateAt(DateTimeUtil.parseDate("dd/MM/yyyy HH:mm:ss",TimeZoneUtils.toDateStringWithTimeZone(item.getUpdateAt(),tzClient)));
+            });
             resultDTO.setData(dataPage);
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             resultDTO.setDescription(Constants.ApiErrorDesc.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/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/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/CampaignExecuteController.java

@@ -34,9 +34,8 @@ public class CampaignExecuteController {
 
     @PostMapping("/searchCampaignExecute")
     @ResponseBody
-    public ResponseEntity<ResultDTO> searchCampaignExecute(@RequestBody CampaignRequestDTO requestDto, HttpServletRequest request) {
-        String xAuthToken = request.getHeader("X-Auth-Token");
-        ResultDTO result = campaignExecuteService.searchCampaignExecute(requestDto, xAuthToken);
+    public ResponseEntity<ResultDTO> searchCampaignExecute(@RequestBody CampaignRequestDTO requestDto) {
+        ResultDTO result = campaignExecuteService.searchCampaignExecute(requestDto);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
@@ -89,6 +88,13 @@ public class CampaignExecuteController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
+    @PostMapping("/getLogoutContactResult")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> getLogoutContactResult(@RequestBody ReceiveCustLogDTO requestDto) {
+        ResultDTO result = campaignExecuteService.getLogoutContactResult(requestDto);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
     @PostMapping("/searchInteractiveResult")
     @ResponseBody
     public ResponseEntity<ResultDTO> searchInteractiveResult(@RequestBody CampaignRequestDTO dto) throws Exception {