phi pd commit: viet chuc nang tim kiem

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/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/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/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,14 +113,19 @@ public class CustomerListServiceImpl implements CustomerListService {
         CustomerListMapper customerListMapper = new CustomerListMapper();
         Date today = new Date();
         CustomerList customerList = new CustomerList();
-
         try {
             if (customerListDTO != null) {
                 // delete
-                customerListRepository.deleteById(customerListDTO.getCustomerListId());
+                if (DataUtil.isNullOrZero(campaignCustomerListRepository.campaignCount(customerListDTO.getCustomerListId()))) {
+                    customerListRepository.deleteById(customerListDTO.getCustomerListId());
+
+                    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);
@@ -129,9 +143,14 @@ public class CustomerListServiceImpl implements CustomerListService {
         ResultDTO resultDTO = new ResultDTO();
         try {
             if (ids != null) {
-                customerListRepository.deleteIds(ids);
-                resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
-                resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+                if (DataUtil.isNullOrZero(campaignCustomerListRepository.campaignIdsCount(ids))) {
+                    customerListRepository.deleteIds(ids);
+                    resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+                    resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+                } else {
+                    resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+                    resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+                }
             } else {
                 resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
                 resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
@@ -141,4 +160,18 @@ public class CustomerListServiceImpl implements CustomerListService {
         }
         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/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);
+    }
 }