hungtt-commit execute-interactive

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

@@ -25,3 +25,4 @@ public interface ApParamRepository extends JpaRepository<ApParam, Long>, ApParam
     List<ApParam> findAllParam();
 
 }
+

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

 package com.viettel.campaign.repository;
 
-import com.viettel.campaign.model.ApParam;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
-
 @Repository
 public interface ApParamRepositoryCustom {
 

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

 package com.viettel.campaign.repository.impl;
 
-import com.viettel.campaign.model.ApParam;
 import com.viettel.campaign.repository.ApParamRepositoryCustom;
-import org.springframework.beans.factory.annotation.Autowired;
+
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import java.util.List;
 
 @Repository
+@Transactional
 public class AppParamRepositoryImpl implements ApParamRepositoryCustom {
 
-    @Autowired
-    EntityManager entityManager;
-
-    public AppParamRepositoryImpl() {
-
-    }
 }

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

@@ -27,6 +27,7 @@ import java.util.List;
 
 @Repository
 public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
+
     private static final Logger logger = LogManager.getLogger(CampaignRepositoryImpl.class);
 
     @Autowired

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

@@ -17,4 +17,6 @@ public interface ApParamService {
     ResultDTO findParamByParType(String parType);
 
     List<ApParam>findAllParam();
+
+
 }

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

@@ -25,8 +25,6 @@ public class ApParamServiceImpl implements ApParamService {
 
     private static final Logger logger = LogManager.getLogger(ApParamServiceImpl.class);
 
-
-
     @Override
     public Iterable<ApParam> getAllParams(int page, int pageSize, String sort) {
         return apParamRepository.findAll(PageRequest.of(page, pageSize, Sort.by(sort)));

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

@@ -31,4 +31,8 @@ public class Constants {
         String ACTIVE_STR = "Trạng thái kêt nối(Không thành công)";
         String INACTIVE_STR = "Trạng thái khảo sát";
     }
+
+    public interface SQL_MODULES {
+        String MODULE_EXECUTE = "campaign-execute";
+    }
 }

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

@@ -2,6 +2,7 @@ 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;
@@ -19,9 +20,18 @@ public class ApParamController {
 
     private static final Logger LOGGER = Logger.getLogger(CustomerController.class);
 
+    private static final String CONNECT_STATUS = "CONNECT_STATUS";
+    private static final String CONNECT_STATUS_TYPE = "1";
+    private static final String SURVEY_STATUS = "SURVEY_STATUS";
+    private static final String SURVEY_STATUS_TYPE = "2";
+    private static final String CAMPAIGN_TYPE = "CAMPAIGN_TYPE";
+
     @Autowired(required = true)
     ApParamService apParamService;
 
+    @Autowired
+    CampaignExecuteService campaignExecuteService;
+
     @GetMapping(path = "/findAlls")
     @ResponseBody
     public ResponseEntity listAllCustomer(@RequestParam("page") int page, @RequestParam("pageSize") int pageSize, @RequestParam("sort") String sort) {
@@ -56,5 +66,20 @@ public class ApParamController {
         }
         return new ResponseEntity(findAll, HttpStatus.OK);
     }
+
+    //<editor-fold: hungtt>
+    @GetMapping("/getDataComboBox")
+    @ResponseBody
+    public ResponseEntity getComboBox(@RequestParam("parType") String parType, @RequestParam("companySiteId") String companySiteId) {
+        if (CONNECT_STATUS.equals(parType)) {
+            return new ResponseEntity<>(campaignExecuteService.getComboBoxStatus(companySiteId, CONNECT_STATUS_TYPE), HttpStatus.OK);
+        } else if (SURVEY_STATUS.equals(parType)){
+            return new ResponseEntity<>(campaignExecuteService.getComboBoxStatus(companySiteId, SURVEY_STATUS_TYPE), HttpStatus.OK);
+        } else {
+            return new ResponseEntity<>(campaignExecuteService.getComboCampaignType(companySiteId), HttpStatus.OK);
+        }
+    }
+
+    //</editor-fold: hungtt>
 }
 

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

 package com.viettel.campaign.web.rest.controller;
 
+import com.viettel.campaign.service.CampaignExecuteService;
 import com.viettel.campaign.service.CampaignService;
+import com.viettel.campaign.web.dto.ContactCustResultDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -16,11 +21,14 @@ import java.util.Map;
 @CrossOrigin
 public class CampaignController {
 
-    private static final Logger LOGGER = Logger.getLogger(CampaignController.class);
+    private static final Logger logger = LoggerFactory.getLogger(CampaignController.class);
 
     @Autowired
     CampaignService campaignService;
 
+    @Autowired
+    CampaignExecuteService campaignExecuteService;
+
     @RequestMapping("/searchCampaignExecute")
     @ResponseBody
     public ResponseEntity<ResultDTO> searchCampaignExecute(@RequestBody CampaignRequestDTO requestDto) {
@@ -50,4 +58,16 @@ public class CampaignController {
         Map result = campaignService.countRecallCustomer(companySiteId, agentId);
         return new ResponseEntity<>(result, HttpStatus.OK);
     }
+
+    @PostMapping("/searchInteractiveResult")
+    @ResponseBody
+    public ResponseEntity<ResultDTO> searchInteractiveResult(@RequestBody CampaignRequestDTO dto) {
+        ResultDTO result = new ResultDTO();
+        try {
+            result = campaignExecuteService.searchInteractiveResult(dto);
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
 }