tubn campaign execute update

src/main/java/com/viettel/campaign/repository/ccms_full/CampaignCustomerRepositoryCustom.java

@@ -8,5 +8,5 @@ import java.util.List;
 @Repository
 public interface CampaignCustomerRepositoryCustom {
 
-    List<CampaignCustomerDTO> getDataCampaignCustomer(CampaignCustomerDTO dto, String expression);
+    List<CampaignCustomerDTO> getDataCampaignCustomer(CampaignCustomerDTO dto, String expression, String dungsai);
 }

src/main/java/com/viettel/campaign/repository/ccms_full/impl/CampaignCustomerRepositoryImpl.java

@@ -4,6 +4,7 @@ import com.viettel.campaign.config.DataSourceQualify;
 import com.viettel.campaign.model.ccms_full.ApParam;
 import com.viettel.campaign.repository.ccms_full.ApParamRepository;
 import com.viettel.campaign.repository.ccms_full.CampaignCustomerRepositoryCustom;
+import com.viettel.campaign.service.impl.CampaignExecuteServiceImp;
 import com.viettel.campaign.utils.Constants;
 import com.viettel.campaign.utils.DataUtil;
 import com.viettel.campaign.utils.HibernateUtil;
@@ -15,6 +16,8 @@ import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.transform.Transformers;
 import org.hibernate.type.*;
+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.PageImpl;
@@ -26,24 +29,22 @@ import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Transactional(DataSourceQualify.CCMS_FULL)
 public class CampaignCustomerRepositoryImpl implements CampaignCustomerRepositoryCustom {
 
-    @Autowired
-    ApParamRepository apParamRepository;
+    private static final Logger logger = LoggerFactory.getLogger(CampaignExecuteServiceImp.class);
 
     @Autowired
     @PersistenceContext(unitName = DataSourceQualify.JPA_UNIT_NAME_CCMS_FULL)
     EntityManager entityManager;
 
     @Override
-    public List<CampaignCustomerDTO> getDataCampaignCustomer(CampaignCustomerDTO customerDTO, String expression) {
+    public List<CampaignCustomerDTO> getDataCampaignCustomer(CampaignCustomerDTO customerDTO, String expression, String dungsai) {
         List<CampaignCustomerDTO> result = new ArrayList<>();
-
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
-
         Session session = sessionFactory.openSession();
         session.beginTransaction();
 
@@ -55,8 +56,10 @@ public class CampaignCustomerRepositoryImpl implements CampaignCustomerRepositor
                 query.setParameter("agentId", customerDTO.getAgentId());
             }
             if (expression.contains(":dungSai")) {
-                List<ApParam> apParam = apParamRepository.findAllParam("DUNG_SAI");
-                query.setParameter("dungSai", apParam.get(0).getParValue());
+                query.setParameter("dungSai", dungsai);
+            }
+            if (expression.contains(":sysdate")) {
+                query.setParameter("sysdate", new Date());
             }
 
             query.addScalar("customerId", new LongType());
@@ -66,7 +69,7 @@ public class CampaignCustomerRepositoryImpl implements CampaignCustomerRepositor
             result = query.list();
 
         } catch (Exception ex) {
-            // ex.printStackTrace();
+            logger.error(ex.getMessage(), ex);
         } finally {
             session.close();
         }

src/main/java/com/viettel/campaign/repository/ccms_full/impl/CampaignExecuteRepositoryImp.java

@@ -591,7 +591,7 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
 
             return result;
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error(e.getMessage(), e);
         } finally {
             if (null != session) {
                 session.close();

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

@@ -65,7 +65,6 @@ public class ApParamServiceImpl implements ApParamService {
                 result.setData(apparam);
             }
         } catch (Exception e) {
-//            e.printStackTrace();
             logger.error(e.getMessage(), e);
         }
 

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

@@ -179,7 +179,7 @@ public class CustomerServiceImpl implements CustomerService {
                 resultDTO.setDescription("customerDTO null");
             }
         } catch (Exception e) {
-            // e.printStackTrace();
+            LOGGER.error(e.getMessage(), e);;
         }
 
         return resultDTO;
@@ -205,7 +205,7 @@ public class CustomerServiceImpl implements CustomerService {
                 resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
             }
         } catch (Exception e) {
-            // e.printStackTrace();
+            LOGGER.error(e.getMessage(), e);;
         }
         return resultDTO;
     }
@@ -239,8 +239,7 @@ public class CustomerServiceImpl implements CustomerService {
                 return DataUtil.convertStringToDateDDMMYYYYHHMISS(DataUtil.safeToString(list.get(0)));
             }
         } catch (Exception e) {
-            //logger.info(e.getMessage(), e);
-            // e.printStackTrace();
+            LOGGER.info(e.getMessage(), e);
         }
         return new Date();
     }
@@ -295,7 +294,7 @@ public class CustomerServiceImpl implements CustomerService {
                 return resultDTO;
             }
         } catch (Exception e) {
-            LOGGER.error(e.getMessage());
+            LOGGER.error(e.getMessage(), e);
             resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
             resultDTO.setDescription("Error");
             return resultDTO;
@@ -324,8 +323,6 @@ public class CustomerServiceImpl implements CustomerService {
                     customerList.setUpdateAt(new Date());
                     customerList.setSource(customerListDTO.getSource());
                     customerList.setCustomerListId(customerListDTO.getCustomerListId());
-
-
                     customerListRepository.save(customerList);
 
                     resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
@@ -339,7 +336,7 @@ public class CustomerServiceImpl implements CustomerService {
                 resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
             }
         } catch (Exception e) {
-            // e.printStackTrace();
+            LOGGER.error(e.getMessage(), e);;
         }
 
         return resultDTO;
@@ -372,7 +369,7 @@ public class CustomerServiceImpl implements CustomerService {
                 resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
             }
         } catch (Exception e) {
-            // e.printStackTrace();
+            LOGGER.error(e.getMessage(), e);;
         }
         return resultDTO;
     }
@@ -421,7 +418,7 @@ public class CustomerServiceImpl implements CustomerService {
             result.setTotalRow(customerContactRepository.findByCustomerIdAndAndContactTypeAndContact(customer.getCustomerId(), customer.getContactType(), customer.getContact(), null).size());
 
         } catch (Exception e) {
-            // e.printStackTrace();
+            LOGGER.error(e.getMessage(), e);;
         }
         return result;
     }
@@ -444,7 +441,7 @@ public class CustomerServiceImpl implements CustomerService {
                 result.setDescription("campaign customer data null");
             }
         } catch (Exception e) {
-            // e.printStackTrace();
+            LOGGER.error(e.getMessage(), e);;
         }
         return result;
     }
@@ -1552,7 +1549,7 @@ public class CustomerServiceImpl implements CustomerService {
             rootNode = new RSQLParser().parse(queryString);
             query = rootNode.accept(visitor, entityManager);
         } catch (Exception e) {
-            // e.printStackTrace();
+            LOGGER.error(e.getMessage(), e);;
             throw new IllegalArgumentException(e.getMessage());
         }
         return query;