commit

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

 package com.viettel.campaign.job;
 
+import com.viettel.campaign.model.Campaign;
+import com.viettel.campaign.model.ProcessConfig;
+import com.viettel.campaign.service.CampaignService;
+import com.viettel.campaign.service.ProcessConfigService;
+import com.viettel.campaign.utils.DateTimeUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author hanv_itsol
@@ -13,11 +23,74 @@ import java.util.Date;
 @Slf4j
 public class CampaignJob {
 
-    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
+    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy HH:mm:ss");
+    private static final String CUSTOMER_INACTIVE_DUARATION =  "CUSTOMER_INACTIVE_DUARATION";
+    private static final String CRON_EXPRESSION_CHECK_START =  "CRON_EXPRESSION_CHECK_START";
+    private static final String CRON_EXPRESSION_CHECK_END =  "CRON_EXPRESSION_CHECK_END";
 
-//    @Scheduled(fixedRate = 6000)
-//    @Transactional( propagation = Propagation.REQUIRED)
+    @Autowired
+    private ProcessConfigService processConfigService;
+
+    @Autowired
+    private CampaignService campaignService;
+
+//    @Scheduled(fixedRate = 5000)
+    @Transactional( propagation = Propagation.REQUIRED)
     public void process() {
-//        log.info("processing job2 ..."+ dateFormat.format(new Date()));
+        log.info(Thread.currentThread().getName() + " The Task executed at " + dateFormat.format(new Date()));
+        List<ProcessConfig> list = processConfigService.findAll();
+
+        list.parallelStream().forEach(p -> {
+            boolean isExecute = DateTimeUtil.isRun(p.getConfigValue(), p.getLastProcess());
+            switch (p.getConfigCode()){
+                case CUSTOMER_INACTIVE_DUARATION:
+                    if(isExecute){
+
+                    }
+                    break;
+                case CRON_EXPRESSION_CHECK_START:
+                    // process
+                    if(isExecute){
+                        // chuyen trang thai Du thao sang Trien khai
+                        log.info("thay doi trang thai");
+                        List<Long> status = new ArrayList<>();
+                        status.add(1L);
+                        status.add(1L);
+                        List<Campaign> campaigns = campaignService.findCampaignByCompanySiteIdAndStartTimeIsLessThanEqualAndStatusIn(p.getSiteId(), new Date(), status);
+                        campaigns.parallelStream().forEach(campaign -> {
+                            campaign.setProcessStatus(1);
+                            campaign.setStatus(2L);
+                            campaign.setCampaignStart(new Date());
+                            campaignService.updateProcess(campaign);
+                        });
+
+                        // update last check
+                        p.setLastProcess(new Date());
+                        processConfigService.update(p);
+                    }
+                    break;
+                case CRON_EXPRESSION_CHECK_END:
+                    // process
+                    if(isExecute){
+                        // chuyen trang thai sang ket thuc
+                        List<Long> status = new ArrayList<>();
+                        status.add(2L);
+                        status.add(3L);
+                        List<Campaign> campaigns = campaignService.findCampaignByCompanySiteIdAndEndTimeIsLessThanEqualAndStatusIn(p.getSiteId(), new Date(), status);
+                        campaigns.parallelStream().forEach(campaign -> {
+                            campaign.setStatus(4L);
+                            campaign.setCampaignEnd(new Date());
+                            campaignService.updateProcess(campaign);
+                        });
                     }
+                    break;
+                default:
+
+            }
+        });
+
+
+    }
+
+
 }

src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepository.java

@@ -10,25 +10,39 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+
 @Repository
-public interface CampaignCompleteCodeRepository extends JpaRepository<CampaignCompleteCode, Long> {
+public interface CampaignCompleteCodeRepository extends JpaRepository<CampaignCompleteCode, Long>, CampaignCompleteCodeRepositoryCustom {
+
     @Query(" select u FROM CampaignCompleteCode u WHERE u.status = 1")
     Page<CampaignCompleteCode> findAll(Pageable pageable);
 
-//    Page<CampaignCompleteCode> findAllByStatus(String status, Pageable pageable);
+    //    Page<CampaignCompleteCode> findAllByStatus(String status, Pageable pageable);
 
     @Query("FROM CampaignCompleteCode WHERE completeName LIKE concat('%', :name, '%') ")
     List<CampaignCompleteCode> findByName(@Param("name") String name, Pageable pageable);
 
-    List<CampaignCompleteCode>findByCompleteNameContains(String name, Pageable pageable);
+    List<CampaignCompleteCode> findByCompleteNameContains(String name, Pageable pageable);
 
     @Modifying
     @Query("update CampaignCompleteCode c set c.status = 0  where c.campaignCompleteCodeId in (:ids)")
     int deleteds(@Param("ids") List<Long> ids);
 
+    //    @Query(value="SELECT  max(completeValue) FROM CampaignCompleteCode WHERE companySiteId = :companySiteId GROUP BY companySiteId")
+    //    Short findByMaxCompanySiteId(Long companySiteId);
+
+    List<CampaignCompleteCode> findCampaignCompleteCodesByCompanySiteId(Long companySiteId);
+
     @Query(value="SELECT max(completeValue) FROM CampaignCompleteCode WHERE companySiteId = :companySiteId GROUP BY companySiteId")
     Short findByMaxCompanySiteId(Long companySiteId);
-//    List<CampaignCompleteCode> findCampaignCompleteCodesByCompanySiteId(Long companySiteId);
 
-//    List<CampaignCompleteCode> findByCampaignIdContainsAndChanel(Long campaignId, String chanel);
+    //    List<CampaignCompleteCode> findCampaignCompleteCodesByCompanySiteId(Long companySiteId);
+
+    //    List<CampaignCompleteCode> findByCampaignIdContainsAndChanel(Long campaignId, String chanel);
+
+    @Query(value = "FROM CampaignCompleteCode WHERE status = 1 AND completeValue = :completeValue AND completeType = :completeType AND companySiteId = :companySiteId")
+    List<CampaignCompleteCode> getCustomerStatus(@Param("completeValue") String completeValue, @Param("completeType") Short completeType, @Param("companySiteId") Long companySiteId);
+
+    @Query(value = "FROM CampaignCompleteCode WHERE status = 1 AND completeValue = :completeValue AND completeType <> :completeType AND companySiteId = :companySiteId")
+    List<CampaignCompleteCode> getCustomerStatusWithoutType(@Param("completeValue") String completeValue, @Param("completeType") Short completeType, @Param("companySiteId") Long companySiteId);
 }

src/main/java/com/viettel/campaign/repository/CampaignCompleteCodeRepositoryCustom.java

 package com.viettel.campaign.repository;
 
-import com.viettel.campaign.web.dto.ResultDTO;
+import com.viettel.campaign.model.CampaignCompleteCode;
 
 public interface CampaignCompleteCodeRepositoryCustom {
 
-    ResultDTO updateStatusById(Long id);
-    ResultDTO findMaxValueCampaignType(Long companySiteId);
+//    CampaignCompleteCode updateStatusById(Long id);
+
+//    CampaignCompleteCode findMaxValueCampaignType(Long companySiteId);
 
 
 }

src/main/java/com/viettel/campaign/repository/impl/CampaignCompleteCompleteCodeRepositoryIpml.java

@@ -6,51 +6,41 @@ import com.viettel.campaign.web.dto.ResultDTO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
-import java.util.List;
 
 @Repository
 public class CampaignCompleteCompleteCodeRepositoryIpml implements CampaignCompleteCodeRepositoryCustom {
+
     @Autowired
     EntityManager entityManager;
 
     private Logger log = LoggerFactory.getLogger(CampaignCompleteCompleteCodeRepositoryIpml.class);
 
-
-    @Override
     @Transactional
-    public ResultDTO updateStatusById(Long id) {
-        ResultDTO dto = new ResultDTO();
+    public CampaignCompleteCode updateStatusById(Long id) {
+        CampaignCompleteCode dto = new CampaignCompleteCode();
         try {
             CampaignCompleteCode e = entityManager.find(CampaignCompleteCode.class, id);
             e.setStatus(new Short("0")); // set status = 0 --> khong hoat dong
             entityManager.merge(e);
-            dto.setErrorCode("00");
         } catch (Exception e) {
             log.error(e.getMessage(), e);
-            dto.setErrorCode("01");
-            dto.setDescription(e.getMessage());
         }
         return dto;
     }
 
-    @Override
     @Transactional
-    public ResultDTO findMaxValueCampaignType(Long companySiteId) {
-        ResultDTO result = new ResultDTO();
-        try{
-            result.setErrorCode("00");
-        }
-        catch(Exception e){
+    public CampaignCompleteCode findMaxValueCampaignType(Long companySiteId) {
+        CampaignCompleteCode result = new CampaignCompleteCode();
+        try {
+
+        } catch (Exception e) {
             log.error(e.getMessage(), e);
-            result.setErrorCode("01");
-            result.setDescription(e.getMessage());
         }
-        return null;
+
+        return result;
     }
 }

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

@@ -24,4 +24,8 @@ public interface CampaignCompleteCodeService {
 
     ResultDTO findMaxValueCampaignCompleteCode(CampaignCompleteCodeDTO completeCodeDTO);
 
+    ResultDTO getListStatus(String completeValue, Short completeType, Long companySiteId);
+
+    ResultDTO getListStatusWithoutType(String completeValue, Short completeType, Long companySiteId);
+
 }

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

@@ -5,8 +5,8 @@ import com.viettel.campaign.web.dto.CustomerContactDTO;
 import com.viettel.campaign.web.dto.CustomerDTO;
 import com.viettel.campaign.web.dto.CustomerListDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
-import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
+import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
 
 public interface CustomerService {
 
@@ -40,10 +40,15 @@ public interface CustomerService {
 
     // ------------ customer contact ------------ //
 
+<<<<<<< HEAD
+=======
+    ResultDTO getCustomerContact(CustomerContactDTO customer);
+
+>>>>>>> 1e6b797350a4aab62031bb2ede27d0beb4dc3bb3
     // danh sach khach hang cua chien dich //
 
     ResultDTO searchCustomerListInfoFromCustomerList(int page, int pageSize, String sort, Long campaignId, Long companySiteId);
-    ResultDTO getCustomerContact(CustomerContactDTO customer);
+
 
     // ------------ customer  ------------ //
 

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

 package com.viettel.campaign.service.impl;
 
+import com.viettel.campaign.mapper.CampaignCompleteCodeMapper;
+import com.viettel.campaign.model.CampaignCompleteCode;
+import com.viettel.campaign.repository.CampaignCompleteCodeRepository;
 import com.viettel.campaign.service.CampaignCompleteCodeService;
 import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.utils.DataUtil;
@@ -7,23 +10,18 @@ import com.viettel.campaign.utils.HibernateUtil;
 import com.viettel.campaign.utils.SQLBuilder;
 import com.viettel.campaign.web.dto.CampaignCompleteCodeDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
-import com.viettel.campaign.mapper.CampaignCompleteCodeMapper;
-import com.viettel.campaign.model.CampaignCompleteCode;
-import com.viettel.campaign.repository.CampaignCompleteCodeRepository;
 import org.hibernate.SQLQuery;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.transform.Transformers;
 import org.hibernate.type.LongType;
-import org.hibernate.type.ShortType;
 import org.hibernate.type.StringType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.data.domain.*;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -253,4 +251,59 @@ public class CampaignCompleteCodeServiceImpl implements CampaignCompleteCodeServ
         }
     }
 
+    @Override
+    public ResultDTO getListStatus(String completeValue, Short completeType, Long companySiteId) {
+        ResultDTO resultDTO = new ResultDTO();
+        try {
+            List<CampaignCompleteCode> list = completeCodeRepository.getCustomerStatus(completeValue, completeType, companySiteId);
+
+            resultDTO.setListData(list);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+        } catch (Exception e) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(e.getMessage());
+        }
+        return resultDTO;
+    }
+
+    @Override
+    public ResultDTO getListStatusWithoutType(String completeValue, Short completeType, Long companySiteId) {
+        ResultDTO resultDTO = new ResultDTO();
+        try {
+            List<CampaignCompleteCode> list = completeCodeRepository.getCustomerStatusWithoutType(completeValue, completeType, companySiteId);
+            resultDTO.setListData(list);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+        } catch (Exception e) {
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(e.getMessage());
+        }
+        return resultDTO;
+    }
+
+//    @Override
+//    public ResultDTO findMaxValueCampaignCompleteCode(CampaignCompleteCodeDTO completeCodeDTO) {
+//        ResultDTO result = new ResultDTO();
+//        CampaignCompleteCodeMapper campaignCompleteCodeMapper = new CampaignCompleteCodeMapper();
+//        CampaignCompleteCode campaignCompleteCode = new CampaignCompleteCode();
+//        try{
+//            short resultmaxValue = completeCodeRepository.findByMaxCompanySiteId(completeCodeDTO.getCompanySiteId());
+//            campaignCompleteCode.setCompleteValue(String.valueOf(resultmaxValue + 1));
+////            if (resultmaxValue < 4) {
+////                resultmaxValue =4;
+////            }
+//            result.setData(resultmaxValue);
+//            result.setErrorCode(Constants.Status.ACTIVE_STR);
+//            result.setDescription(Constants.Status.ACTIVE_STR);
+//        }
+//        catch (Exception e){
+//            logger.error(e.getMessage(), e);
+//            result.setErrorCode("-1");
+//            return result;
+//        }
+//        result.setErrorCode("0");
+//        return result;
+//    }
+
 }

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

@@ -3,7 +3,6 @@ package com.viettel.campaign.web.rest;
 import com.viettel.campaign.model.ApParam;
 import com.viettel.campaign.service.ApParamService;
 import com.viettel.campaign.service.CampaignExecuteService;
-import com.viettel.campaign.web.rest.controller.CustomerController;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;

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

@@ -3,12 +3,10 @@ package com.viettel.campaign.web.rest;
 import com.viettel.campaign.web.dto.CampaignCompleteCodeDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.service.CampaignCompleteCodeService;
-import com.viettel.campaign.web.rest.controller.CustomerController;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -100,6 +98,18 @@ public class CampaignCompleteCodeController {
          return completeCodeService.findMaxValueCampaignCompleteCode(completeCodeDTO);
     }
 
+    @GetMapping("/getListStatus")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> getListStatus(@RequestParam("completeValue") String completeValue, @RequestParam("completeType") Short completeType, @RequestParam("companySiteId") Long companySiteId) {
+        ResultDTO result = completeCodeService.getListStatus(completeValue, completeType, companySiteId);
+        return new ResponseEntity(result, HttpStatus.OK);
+    }
 
+    @GetMapping("/getListStatusWithoutType")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> getListStatusWithoutType(@RequestParam("completeValue") String completeValue, @RequestParam("completeType") Short completeType, @RequestParam("companySiteId") Long companySiteId) {
+        ResultDTO result = completeCodeService.getListStatusWithoutType(completeValue, completeType, companySiteId);
+        return new ResponseEntity(result, HttpStatus.OK);
+    }
 
 }

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

-package com.viettel.campaign.web.rest.controller;
+package com.viettel.campaign.web.rest;
 
 import com.viettel.campaign.service.CampaignExecuteService;
 import com.viettel.campaign.service.CampaignService;
@@ -9,7 +9,10 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+<<<<<<< HEAD:src/main/java/com/viettel/campaign/web/rest/controller/CampaignController.java
 import org.springframework.cloud.sleuth.instrument.reactor.ReactorSleuth;
+=======
+>>>>>>> 1e6b797350a4aab62031bb2ede27d0beb4dc3bb3:src/main/java/com/viettel/campaign/web/rest/CampaignController.java
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -17,7 +20,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

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

-package com.viettel.campaign.web.rest.controller;
+package com.viettel.campaign.web.rest;
 
 import com.viettel.campaign.web.dto.CustomerContactDTO;
 import com.viettel.campaign.web.dto.CustomerDTO;