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

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

@@ -17,7 +17,7 @@ public class CampaignJob {
 
 //    @Scheduled(fixedRate = 6000)
 //    @Transactional( propagation = Propagation.REQUIRED)
-//    public void process() {
+    public void process() {
 //        log.info("processing job2 ..."+ dateFormat.format(new Date()));
-//    }
+    }
 }

src/main/java/com/viettel/campaign/model/CampaignCustomerList.java

+package com.viettel.campaign.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+@Entity
+@Table(name = "CAMPAIGN_CUSTOMERLIST")
+@Getter
+@Setter
+public class CampaignCustomerList {
+    @Id
+    @GeneratedValue(generator = "campaign_customerlist_seq")
+    @SequenceGenerator(name = "campaign_customerlist_seq", sequenceName = "campaign_customerlist_seq", allocationSize = 1)
+    @Basic(optional = false)
+    @NotNull
+    @Column(name = "CAMPAIGN_CUSTOMERLIST_ID")
+    private Long campaignCustomerListId;
+    @Column(name = "CAMPAIGN_ID")
+    private Long campaignId;
+    @Column(name = "CUSTOMER_LIST_ID")
+    private Long customerListId;
+    @Column(name = "CUSTOMER_NUMBER")
+    private Long customerNumber;
+    @Column(name = "FILTER_TYPE")
+    private Short filterType;
+    @Column(name = "COMPANY_SITE_ID")
+    private Long companySiteId;
+    @Column(name = "AGENT_FILTER_STATUS")
+    private Short agentFilterStatus;
+}

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

+package com.viettel.campaign.repository;
+
+import com.viettel.campaign.model.CampaignCustomerList;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface CampaignCustomerListRepository extends JpaRepository<CampaignCustomerList, Long> {
+
+    @Query("select count (c.campaignId) from CampaignCustomerList c where c.customerListId=:customerListId")
+    Long campaignCount(@Param("customerListId") long customerListId);
+
+    @Query("select count (c.campaignId) from CampaignCustomerList c where c.customerListId in (:ids)")
+    Long campaignIdsCount(@Param("ids") List<Long> ids);
+}

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

@@ -13,4 +13,5 @@ public interface CampaignRepositoryCustom {
     List<CampaignDTO> searchCampaignExecute(String agentId, Pageable pageable);
 
     ResultDTO search(CampaignRequestDTO requestDto);
+    ResultDTO findByCampaignCode(CampaignRequestDTO requestDTO);
 }

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

 package com.viettel.campaign.repository;
 
 import com.viettel.campaign.model.CustomerList;
-import com.viettel.campaign.web.dto.ResultDTO;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.util.Date;
 import java.util.List;
 
 public interface CustomerListRepository extends JpaRepository<CustomerList, Long> {
@@ -18,4 +20,7 @@ public interface CustomerListRepository extends JpaRepository<CustomerList, Long
     @Modifying
     @Query("delete from CustomerList c where c.customerListId in (:ids)")
     int deleteIds(@Param("ids") List<Long> ids);
+
+    @Query("select c from CustomerList c where c.customerListCode=:customerListCode or c.customerListName=:customerListName or c.createAt >:dateFrom and c.createAt <:dateTo or c.createAt=:dateFrom or c.createAt=:dateTo")
+    Page<CustomerList> searchCustomerList(@Param("customerListCode") String customerListCode, @Param("customerListName") String customerListName, @Param("dateFrom") Date dateFrom, @Param("dateTo") Date dateTo, Pageable pageable);
 }

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

@@ -82,11 +82,16 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         Session session = sessionFactory.openSession();
         session.beginTransaction();
 
+        if(DataUtil.isNullOrEmpty(requestDto.getCompanySiteId())) {
+            result.setErrorCode(Constants.ApiErrorCode.ERROR);
+            result.setDescription(Constants.ApiErrorDesc.ERROR);
+            return result;
+        }
         try {
             StringBuilder sqlStr = new StringBuilder();
             sqlStr.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "search-campaign-by-params"));
             if (!DataUtil.isNullOrEmpty(requestDto.getCampaignCode())) {
-                sqlStr.append(" AND UPPER(a.CAMPAIGN_CODE) LIKE :p_code");
+                sqlStr.append(" AND a.CAMPAIGN_CODE IN (:p_code) ");
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getCampaignName())) {
                 sqlStr.append(" AND UPPER(a.CAMPAIGN_NAME) LIKE :p_name");
@@ -97,11 +102,11 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             if (!DataUtil.isNullOrEmpty(requestDto.getFromDateFr())) {
                 sqlStr.append(" AND TO_DATE(a.START_TIME, 'DD/MM/YYYY') >= :p_frDateFr");
             }
-            if (!DataUtil.isNullOrEmpty(requestDto.getFromDateTo())) {
-                sqlStr.append(" AND TO_DATE(a.START_TIME, 'DD/MM/YYYY') <= :p_frDateTo");
-            }
             if (!DataUtil.isNullOrEmpty(requestDto.getToDateFr())) {
-                sqlStr.append(" AND TO_DATE(a.END_TIME, 'DD/MM/YYYY') >= :p_toDateFr");
+                sqlStr.append(" AND TO_DATE(a.START_TIME, 'DD/MM/YYYY') <= :p_toDateFr");
+            }
+            if (!DataUtil.isNullOrEmpty(requestDto.getFromDateTo())) {
+                sqlStr.append(" AND TO_DATE(a.END_TIME, 'DD/MM/YYYY') >= :p_frDateTo");
             }
             if (!DataUtil.isNullOrEmpty(requestDto.getToDateTo())) {
                 sqlStr.append(" AND TO_DATE(a.END_TIME, 'DD/MM/YYYY') <= :p_toDateTo");
@@ -129,12 +134,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
 
             SQLQuery query = session.createSQLQuery(sqlStr.toString());
             if (!DataUtil.isNullOrEmpty(requestDto.getCampaignCode())) {
-                query.setParameter("p_code", "%" +
-                        requestDto.getCampaignCode().toUpperCase()
-                                .replace("\\", "\\\\")
-                                .replaceAll("%", "\\\\%")
-                                .replaceAll("_", "\\\\_")
-                        + "%");
+                String[] lstCode = requestDto.getCampaignCode().split(",");
+                query.setParameterList("p_code", lstCode);
             }
 
             if (!DataUtil.isNullOrEmpty(requestDto.getCampaignName())) {
@@ -146,6 +147,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
                         + "%");
             }
 
+            query.setParameter("p_company_site_id", requestDto.getCompanySiteId());
+
             if (requestDto.getStatus() != null && requestDto.getStatus() > 0) {
                 query.setParameter("p_status", requestDto.getStatus());
             }
@@ -213,6 +216,77 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         return result;
     }
 
+    @Override
+    public ResultDTO findByCampaignCode(CampaignRequestDTO requestDto) {
+        ResultDTO result = new ResultDTO();
+        SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
+
+        Session session = sessionFactory.openSession();
+        session.beginTransaction();
+
+        if(DataUtil.isNullOrEmpty(requestDto.getCompanySiteId())) {
+            result.setErrorCode(Constants.ApiErrorCode.ERROR);
+            result.setDescription(Constants.ApiErrorDesc.ERROR);
+            return result;
+        }
+        try {
+            StringBuilder sqlStr = new StringBuilder();
+            sqlStr.append(" SELECT CAMPAIGN_ID campaignId, " +
+                    "       CAMPAIGN_CODE campaignCode, " +
+                    "       CAMPAIGN_NAME campaignName, " +
+                    "       START_TIME startTime," +
+                    "       END_TIME endTime, " +
+                    "       STATUS status " +
+                    " FROM CAMPAIGN" +
+                    " WHERE COMPANY_SITE_ID = :p_company_site_id AND STATUS <> -1 ");
+            if(!DataUtil.isNullOrEmpty(requestDto.getCampaignCode())) {
+                sqlStr.append(" AND CAMPAIGN_CODE LIKE :p_code ");
+            }
+            sqlStr.append(" ORDER BY START_TIME DESC ");
+            SQLQuery query = session.createSQLQuery(sqlStr.toString());
+            query.setParameter("p_company_site_id", requestDto.getCompanySiteId());
+            if(!DataUtil.isNullOrEmpty(requestDto.getCampaignCode())) {
+                query.setParameter("p_code", "%" +
+                        requestDto.getCampaignCode().toUpperCase()
+                                .replace("\\", "\\\\")
+                                .replaceAll("%", "\\\\%")
+                                .replaceAll("_", "\\\\_")
+                        + "%");
+            }
+            query.addScalar("campaignId", new BigDecimalType());
+            query.addScalar("campaignCode", new StringType());
+            query.addScalar("campaignName", new StringType());
+            query.addScalar("startTime", new DateType());
+            query.addScalar("endTime", new DateType());
+            query.addScalar("status", new ShortType());
+
+            query.setResultTransformer(Transformers.aliasToBean(CampaignDTO.class));
+            int count = 0;
+            List<CampaignDTO> list = query.list();
+            if (list.size() > 0) {
+                count = query.list().size();
+            }
+            Pageable pageable = buildPageable(requestDto);
+            if (pageable != null) {
+                query.setFirstResult(pageable.getPageNumber() * pageable.getPageSize());
+                query.setMaxResults(pageable.getPageSize());
+            }
+            List<CampaignDTO> data = query.list();
+            Page<CampaignDTO> dataPage = new PageImpl<>(data, pageable, count);
+            result.setData(dataPage);
+            result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            result.setDescription(Constants.ApiErrorDesc.SUCCESS);
+            session.close();
+
+            return result;
+        }catch (Exception ex) {
+            session.close();
+        }
+        result.setErrorCode(Constants.ApiErrorCode.ERROR);
+        result.setDescription(Constants.ApiErrorDesc.ERROR);
+        return result;
+    }
+
     private Pageable buildPageable(CampaignRequestDTO obj) {
         Pageable pageable = null;
         if (DataUtil.isNullOrEmpty(obj.getSort())) {

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

@@ -9,4 +9,5 @@ public interface CampaignService {
     Map searchCampaignExecute(int page, int pageSize, String sort, String agentId);
 
     ResultDTO search(CampaignRequestDTO requestDto);
+    ResultDTO findByCampaignCode(CampaignRequestDTO requestDTO);
 }

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

@@ -3,6 +3,7 @@ package com.viettel.campaign.service;
 import com.viettel.campaign.web.dto.CustomerListDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -17,4 +18,6 @@ public interface CustomerListService {
     ResultDTO deleteCustomerList(CustomerListDTO customerListDTO);
 
     ResultDTO deleteIds(List<Long> ids);
+
+    Map searchCustomerList(String customerListCode, String customerListName, Date dateFrom, Date dateTo, int page, int pageSize, String sort);
 }

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

 package com.viettel.campaign.service.impl;
 
+import com.viettel.campaign.model.Campaign;
 import com.viettel.campaign.repository.CampaignRepository;
 import com.viettel.campaign.service.CampaignService;
 import com.viettel.campaign.web.dto.CampaignDTO;
@@ -39,4 +40,9 @@ public class CampaignServiceImpl implements CampaignService {
     public ResultDTO search(CampaignRequestDTO requestDto) {
         return campaignRepository.search(requestDto);
     }
+
+    @Override
+    public ResultDTO findByCampaignCode(CampaignRequestDTO requestDTO) {
+        return campaignRepository.findByCampaignCode(requestDTO);
+    }
 }

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

-package com.viettel.campaign.service.impl;
-
-<<<<<<< HEAD:src/main/java/com/viettel/campaign/service/CampaignServiceImpl.java
-import com.viettel.campaign.repository.CampaignRepository;
-import com.viettel.campaign.web.dto.CampaignDTO;
-=======
-import com.viettel.campaign.dto.CampaignDTO;
-import com.viettel.campaign.dto.ResultDTO;
-import com.viettel.campaign.dto.request_dto.CampaignRequestDTO;
-import com.viettel.campaign.model.Campaign;
-import com.viettel.campaign.repository.CampaignRepository;
-import com.viettel.campaign.service.CampaignService;
->>>>>>> anhvd_campaign_mng:src/main/java/com/viettel/campaign/service/impl/CampaignServiceImpl.java
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class CampaignServiceImpl implements CampaignService {
-
-    @Autowired(required=true)
-    CampaignRepository campaignRepository;
-
-    @Override
-    public Map searchCampaignExecute(int page, int pageSize, String sort, String agentId) {
-        Map result = new HashMap();
-        List<CampaignDTO> lst = new ArrayList<>();
-
-        Pageable pageable = PageRequest.of(page, pageSize, Sort.by(sort));
-        lst = campaignRepository.searchCampaignExecute(agentId, pageable);
-
-        result.put("totalItem", lst.size());
-        result.put("data", lst);
-
-        return result;
-    }
-
-    @Override
-    public ResultDTO search(CampaignRequestDTO requestDto) {
-        return campaignRepository.search(requestDto);
-    }
-}

src/main/java/com/viettel/campaign/service/CustomerListServiceImpl.java → src/main/java/com/viettel/campaign/service/impl/CustomerListServiceImpl.java

-package com.viettel.campaign.service;
+package com.viettel.campaign.service.impl;
 
 import com.viettel.campaign.mapper.CustomerListMapper;
 import com.viettel.campaign.model.CustomerList;
+import com.viettel.campaign.repository.CampaignCustomerListRepository;
 import com.viettel.campaign.repository.CustomerListRepository;
+import com.viettel.campaign.service.CustomerListService;
 import com.viettel.campaign.utils.Constants;
+import com.viettel.campaign.utils.DataUtil;
 import com.viettel.campaign.web.dto.CustomerListDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -26,6 +31,11 @@ public class CustomerListServiceImpl implements CustomerListService {
     @Autowired
     CustomerListRepository customerListRepository;
 
+    @Autowired
+    CampaignCustomerListRepository campaignCustomerListRepository;
+
+    private Logger logger = LogManager.getLogger(CustomerListServiceImpl.class);
+
     @Override
     public Map getCustomerList(int page, int pageSize, String sort) {
         Map result = new HashMap();
@@ -46,7 +56,6 @@ public class CustomerListServiceImpl implements CustomerListService {
         CustomerListMapper customerListMapper = new CustomerListMapper();
         Date today = new Date();
         CustomerList customerList = new CustomerList();
-
         try {
             if (customerListDTO != null) {
                 // insert
@@ -104,10 +113,10 @@ public class CustomerListServiceImpl implements CustomerListService {
         CustomerListMapper customerListMapper = new CustomerListMapper();
         Date today = new Date();
         CustomerList customerList = new CustomerList();
-
         try {
             if (customerListDTO != null) {
                 // delete
+                if (DataUtil.isNullOrZero(campaignCustomerListRepository.campaignCount(customerListDTO.getCustomerListId()))) {
                     customerListRepository.deleteById(customerListDTO.getCustomerListId());
 
                     resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
@@ -116,6 +125,11 @@ public class CustomerListServiceImpl implements CustomerListService {
                     resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
                     resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
                 }
+
+            } else {
+                resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+                resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -129,6 +143,7 @@ public class CustomerListServiceImpl implements CustomerListService {
         ResultDTO resultDTO = new ResultDTO();
         try {
             if (ids != null) {
+                if (DataUtil.isNullOrZero(campaignCustomerListRepository.campaignIdsCount(ids))) {
                     customerListRepository.deleteIds(ids);
                     resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
                     resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
@@ -136,9 +151,27 @@ public class CustomerListServiceImpl implements CustomerListService {
                     resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
                     resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
                 }
+            } else {
+                resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+                resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
         return resultDTO;
     }
+
+    @Override
+    public Map searchCustomerList(String customerListCode, String customerListName, Date dateFrom, Date dateTo, int page, int pageSize, String sort) {
+        Map result = new HashMap();
+        List<CustomerList> list = new ArrayList<>();
+
+        Pageable pageable = PageRequest.of(page, pageSize, Sort.by(sort));
+        Page<CustomerList> pc = customerListRepository.searchCustomerList(customerListCode, customerListName, dateFrom, dateTo, pageable);
+
+        result.put("totalItem", pc.getTotalElements());
+        result.put("searchList", pc.iterator());
+
+        return result;
+    }
 }

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

@@ -4,8 +4,6 @@ import com.viettel.campaign.web.dto.BaseDTO;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.Date;
-
 /**
  * @author anhvd_itsol
  */
@@ -25,4 +23,5 @@ public class CampaignRequestDTO extends BaseDTO {
     Long numOfCusTo;
     Short type;
     Short chanel;
+    String companySiteId;
 }

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

 package com.viettel.campaign.web.rest;
 
-import com.viettel.campaign.model.CustomerList;
 import com.viettel.campaign.service.CustomerListService;
 import com.viettel.campaign.web.dto.CustomerListDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
@@ -11,7 +10,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -52,7 +51,7 @@ public class CustomerListController {
 
     @PutMapping("/update")
     @ResponseBody
-    public ResultDTO updateCompleteCode(@RequestBody @Valid CustomerListDTO customerListDTO) {
+    public ResultDTO updateCustomerList(@RequestBody @Valid CustomerListDTO customerListDTO) {
         ResultDTO result = new ResultDTO();
         //LogUtil logUtil = new LogUtil();
         //logUtil.initKpiLog("createCust");
@@ -71,7 +70,7 @@ public class CustomerListController {
 
     @PostMapping("/delete")
     @ResponseBody
-    public ResultDTO deleteCompleteCode(@RequestBody @Valid CustomerListDTO customerListDTO) {
+    public ResultDTO deleteCustomerList(@RequestBody @Valid CustomerListDTO customerListDTO) {
         ResultDTO result = new ResultDTO();
         result = customerListService.deleteCustomerList(customerListDTO);
         return result;
@@ -84,4 +83,11 @@ public class CustomerListController {
         result = customerListService.deleteIds(ids);
         return result;
     }
+
+    @GetMapping("/search")
+    @ResponseBody
+    public ResponseEntity searchCustomerList(@RequestParam("customerListCode") String customerListCode, @RequestParam("customerListName") String customerListName, @RequestParam("dateFrom") Date dateFrom, @RequestParam("dateTo") Date dateTo, @RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort) {
+        Map result = customerListService.searchCustomerList(customerListCode, customerListName, dateFrom, dateTo, page, pageSize, sort);
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
 }

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

@@ -34,4 +34,9 @@ public class CampaignController {
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
+    @RequestMapping(value = "/findByCampaignCode", method = RequestMethod.POST)
+    public ResultDTO findByCampaignCode(@RequestBody CampaignRequestDTO dto) {
+        return campaignService.findByCampaignCode(dto);
+    }
+
 }

src/main/resources/sql/campaign-mng/search-campaign-by-params.sql

@@ -30,3 +30,5 @@ LEFT JOIN (SELECT cc.campaign_id, count(*) AS SLKHDoNotCall_Khoa
         GROUP BY cc.CAMPAIGN_ID) d
 ON d.CAMPAIGN_ID = a.CAMPAIGN_ID
 WHERE 1 = 1
+AND COMPANY_SITE_ID = :p_company_site_id
+AND a.STATUS <> -1