anhvd commit campaign mng services + common services

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

@@ -17,4 +17,7 @@ public interface ApParamRepository extends JpaRepository<ApParam, Long>, ApParam
 
     @Query(value = "SELECT p FROM ApParam p WHERE parName LIKE concat('%', :parName, '%') ")
     List<ApParam> findParamByName(@Param("parName") String parName, Pageable pageable);
+
+    @Query(value = "SELECT p FROM ApParam p WHERE status = 1 AND parType LIKE concat('%', :parType, '%') ")
+    List<ApParam> findParamByParType(@Param("parType") String parType);
 }

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

@@ -8,6 +8,8 @@ import com.viettel.campaign.utils.SQLBuilder;
 import com.viettel.campaign.web.dto.CampaignDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.web.dto.request_dto.CampaignRequestDTO;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.hibernate.SQLQuery;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
@@ -19,6 +21,7 @@ import org.springframework.stereotype.Repository;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
+import javax.xml.crypto.Data;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
@@ -26,6 +29,7 @@ import java.util.List;
 
 @Repository
 public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
+    private static final Logger logger = LogManager.getLogger(CampaignRepositoryImpl.class);
 
     @Autowired
     EntityManager entityManager;
@@ -76,6 +80,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
 
     @Override
     public ResultDTO search(CampaignRequestDTO requestDto) {
+        logger.info("Start search campaign::");
+
         ResultDTO result = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
@@ -117,10 +123,10 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             if (!DataUtil.isNullOrZero(requestDto.getNumOfCusTo())) {
                 sqlStr.append(" AND a.CUSTOMER_NUMBER <= :p_cusNumTo");
             }
-            if (requestDto.getType() != null) {
-                sqlStr.append(" AND a.CAMPAIGN_TYPE = :p_type");
+            if (!DataUtil.isNullOrEmpty(requestDto.getTypes())) {
+                sqlStr.append(" AND a.CAMPAIGN_TYPE IN (:p_type)");
             }
-            if (requestDto.getChanel() != null && requestDto.getChanel() > 0) {
+            if (requestDto.getChanel() != null && !DataUtil.isNullOrZero(requestDto.getChanel())) {
                 sqlStr.append(" AND a.CHANEL = :p_chanel");
             }
             if (!DataUtil.isNullOrZero(requestDto.getNumOfCusFr())) {
@@ -164,10 +170,11 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             if (!DataUtil.isNullOrEmpty(requestDto.getToDateTo())) {
                 query.setParameter("p_toDateTo", requestDto.getToDateTo());
             }
-            if (requestDto.getType() != null) {
-                query.setParameter("p_type", requestDto.getType());
+            if (!DataUtil.isNullOrEmpty(requestDto.getTypes())) {
+                String[] types = requestDto.getTypes().split(",");
+                query.setParameterList("p_type", types);
             }
-            if (requestDto.getChanel() != null && requestDto.getChanel() > 0) {
+            if (requestDto.getChanel() != null && !DataUtil.isNullOrZero(requestDto.getChanel())) {
                 query.setParameter("p_chanel", requestDto.getChanel());
             }
             if (!DataUtil.isNullOrZero(requestDto.getNumOfCusFr())) {
@@ -181,6 +188,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             query.addScalar("campaignCode", new StringType());
             query.addScalar("campaignName", new StringType());
             query.addScalar("campaignType", new StringType());
+            query.addScalar("campaignTypeName", new StringType());
             query.addScalar("chanel", new ShortType());
             query.addScalar("startTime", new DateType());
             query.addScalar("endTime", new DateType());
@@ -206,18 +214,19 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             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);
+            logger.error(ex.getMessage(), ex);
+        } finally {
+            session.close();
+        }
         return result;
     }
 
     @Override
     public ResultDTO findByCampaignCode(CampaignRequestDTO requestDto) {
+        logger.info("Start search campaign by code::");
         ResultDTO result = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
@@ -276,14 +285,13 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             result.setData(dataPage);
             result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             result.setDescription(Constants.ApiErrorDesc.SUCCESS);
-            session.close();
-
-            return result;
         }catch (Exception ex) {
-            session.close();
-        }
+            logger.error(ex.getMessage(), ex);
             result.setErrorCode(Constants.ApiErrorCode.ERROR);
             result.setDescription(Constants.ApiErrorDesc.ERROR);
+        } finally {
+            session.close();
+        }
         return result;
     }
 

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

@@ -13,4 +13,6 @@ public interface ApParamService {
     List<ApParam> getParamByName(int page, int pageSize, String sort, String parName);
 
     ResultDTO createApParam(ApParamDTO apParamDTO);
+
+    ResultDTO findParamByParType(String parType);
 }

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

 package com.viettel.campaign.service.impl;
 
 import com.viettel.campaign.service.ApParamService;
+import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.web.dto.ApParamDTO;
 import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.mapper.ApParamMapper;
@@ -13,6 +14,8 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 @Service
 public class ApParamServiceImpl implements ApParamService {
@@ -20,6 +23,10 @@ public class ApParamServiceImpl implements ApParamService {
     @Autowired
     ApParamRepository apParamRepository;
 
+    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)));
@@ -53,9 +60,27 @@ public class ApParamServiceImpl implements ApParamService {
                 result.setData(apparam);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+//            e.printStackTrace();
+            logger.error(e.getMessage(), e);
         }
 
         return null;
     }
+
+    @Override
+    public ResultDTO findParamByParType(String parType) {
+        ResultDTO resultDTO = new ResultDTO();
+        try {
+            List<ApParam> lst = apParamRepository.findParamByParType(parType);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
+            resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
+            resultDTO.setData(lst);
+            logger.info("find params by type: " + resultDTO.getErrorCode());
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
+            resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
+            resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
+        }
+        return resultDTO;
+    }
 }

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

@@ -266,4 +266,8 @@ public class DataUtil {
         }
         return input;
     }
+
+    public static boolean isNullOrZero(Short value) {
+        return (value == null || value.equals(Short.parseShort("0")));
+    }
 }

src/main/java/com/viettel/campaign/web/dto/CampaignDTO.java

@@ -57,4 +57,5 @@ public class CampaignDTO extends BaseDTO {
     private Long numOfJoinedCus;
     private Long numOfNotJoinedCus;
     private Long numOfLockCus;
+    private String campaignTypeName;
 }

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

@@ -24,4 +24,5 @@ public class CampaignRequestDTO extends BaseDTO {
     Short type;
     Short chanel;
     String companySiteId;
+    String types;
 }

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

@@ -13,6 +13,7 @@ import java.util.List;
 
 @Controller
 @RequestMapping("/ipcc/apParam")
+@CrossOrigin
 public class ApParamController {
 
     private static final Logger LOGGER = Logger.getLogger(CustomerController.class);
@@ -39,4 +40,9 @@ public class ApParamController {
 
         return new ResponseEntity(lst, HttpStatus.OK);
     }
+
+    @RequestMapping(path = "/findParamByParType", method = RequestMethod.GET)
+    public ResponseEntity findParamByParType(@RequestParam String parType) {
+        return new ResponseEntity<>(apParamService.findParamByParType(parType), HttpStatus.OK);
+    }
 }

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

@@ -3,6 +3,7 @@ SELECT
     a.CAMPAIGN_CODE campaignCode,
     a.CAMPAIGN_NAME campaignName,
     a.CAMPAIGN_TYPE campaignType,
+    (SELECT PAR_NAME FROM AP_PARAM WHERE STATUS = 1 AND PAR_TYPE = 'CAMPAIGN_TYPE' AND PAR_VALUE = a.CAMPAIGN_TYPE) campaignTypeName,
     a.CHANEL chanel,
     a.START_TIME startTime,
     a.END_TIME endTime,