damdt commit

src/main/java/com/viettel/campaign/filter/CorsFilter.java

@@ -30,27 +30,27 @@ public class CorsFilter implements Filter {
 
         HttpServletRequest request = (HttpServletRequest) req;
 
-//        chain.doFilter(req, response);
-
-        if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
-            chain.doFilter(req, resp);
-            return;
-        }
-        if ("/".equals(request.getRequestURI())) {
-            chain.doFilter(req, resp);
-            return;
-        }
-        String xAuthToken = request.getHeader("X-Auth-Token");
-        if (xAuthToken == null || "".equals(xAuthToken)) {
-            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is null.");
-            return;
-        }
-        Object obj = RedisUtil.getInstance().get(xAuthToken);
-        if (obj instanceof UserSession) {
-            chain.doFilter(req, resp);
-        } else {
-            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is invalid.");
-        }
+        chain.doFilter(req, response);
+
+//        if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
+//            chain.doFilter(req, resp);
+//            return;
+//        }
+//        if ("/".equals(request.getRequestURI())) {
+//            chain.doFilter(req, resp);
+//            return;
+//        }
+//        String xAuthToken = request.getHeader("X-Auth-Token");
+//        if (xAuthToken == null || "".equals(xAuthToken)) {
+//            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is null.");
+//            return;
+//        }
+//        Object obj = RedisUtil.getInstance().get(xAuthToken);
+//        if (obj instanceof UserSession) {
+//            chain.doFilter(req, resp);
+//        } else {
+//            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "The token is invalid.");
+//        }
     }
 
     @Override

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

+package com.viettel.campaign.repository.ccms_full;
+
+import com.viettel.campaign.model.ccms_full.Customer;
+
+import java.util.List;
+
+public interface CustomerQueryRepository {
+    List<Customer> findAll(String rsqlQuery);
+}

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

+package com.viettel.campaign.repository.ccms_full.impl;
+
+import com.github.tennaito.rsql.jpa.JpaCriteriaQueryVisitor;
+import com.viettel.campaign.model.ccms_full.Customer;
+import com.viettel.campaign.repository.ccms_full.CustomerQueryRepository;
+import cz.jirutka.rsql.parser.RSQLParser;
+import cz.jirutka.rsql.parser.ast.Node;
+import cz.jirutka.rsql.parser.ast.RSQLVisitor;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.criteria.CriteriaQuery;
+import java.util.List;
+
+public class CustomerQueryRepositoryImpl implements CustomerQueryRepository {
+    @PersistenceContext
+    private EntityManager entityManager;
+    private RSQLVisitor<CriteriaQuery<Customer>, EntityManager> visitor = new JpaCriteriaQueryVisitor<Customer>();
+    private RSQLParser parser = new RSQLParser();
+
+    @Override
+    public List<Customer> findAll(String rsqlQuery) {
+        Node node = parser.parse(rsqlQuery);
+        CriteriaQuery<Customer> query = node.accept(visitor, entityManager);
+
+        return entityManager.createQuery(query).getResultList();
+    }
+}

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

@@ -77,5 +77,6 @@ public interface CustomerService {
     Long countByQuery(String queryString);
 //    Map<String, CustomizeRequestDTo>  searchCustomer();
 ////    List<CustomizeFields> searchCustomize();
-    ResultDTO searchCustomizeFields(CustomizeRequestDTo customizeFields);
+    ResultDTO listCustomizeFields(CustomizeRequestDTo customizeFields);
+    ResultDTO searchCustomizeFields(CustomizeRequestDTo customizeRequestDTo);
 }

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

@@ -83,6 +83,7 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
             sb.append("  and COMPANY_SITE_ID = :p_company_site_id");
             sb.append(" and COMPLETE_VALUE not in (1,2,3,4)");
             sb.append("ORDER BY to_number(COMPLETE_VALUE) ");
+            logger.info("SQL statement: " + sb);
 
 
 

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

@@ -609,16 +609,16 @@ public class CustomerServiceImpl implements CustomerService {
         DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd");
         Date currentDate = new Date(dateFormat.format(new Date()));
         Date oldDate = new Date(apParam.getDescription());
-        Long newDay = (currentDate.getTime() - oldDate.getTime())/(1000*60*60*24);
+        Long newDay = (currentDate.getTime() - oldDate.getTime()) / (1000 * 60 * 60 * 24);
         String convertDate = dateFormat.format(new Date());
         String[] dateArray = convertDate.split("/");
 
         if (newDay == 0) {
             apParamRepository.updateCustomerListSeq(String.valueOf(Integer.parseInt(apParam.getParValue()) + 1), apParam.getDescription());
-            customerListDTO.setCustomerListCode(dateArray[0]+dateArray[2]+dateArray[1]+"_"+(Integer.parseInt(apParam.getParValue()) + 1)+" "+customerListDTO.getCustomerListCode());
+            customerListDTO.setCustomerListCode(dateArray[0] + dateArray[2] + dateArray[1] + "_" + (Integer.parseInt(apParam.getParValue()) + 1) + " " + customerListDTO.getCustomerListCode());
         } else {
             apParamRepository.updateCustomerListSeq("1", dateFormat.format(new Date()));
-            customerListDTO.setCustomerListCode(dateArray[0]+dateArray[2]+dateArray[1]+"_1"+" "+customerListDTO.getCustomerListCode());
+            customerListDTO.setCustomerListCode(dateArray[0] + dateArray[2] + dateArray[1] + "_1" + " " + customerListDTO.getCustomerListCode());
         }
 
         // THÍM NÀO MERGE CONFLICT THÌ GIỮ LẠI HỘ E CÁI METHOD NÀY VỚI
@@ -1702,48 +1702,77 @@ public class CustomerServiceImpl implements CustomerService {
 //        sb.append("");
 //        sb.append("");
     @Override
-    public ResultDTO searchCustomizeFields(CustomizeRequestDTo customizeFields) {
+    public ResultDTO listCustomizeFields(CustomizeRequestDTo customizeFields) {
         ResultDTO resultDTO = new ResultDTO();
         Map<String, String> params = new HashMap<>();
-        List<FieldsToShowDTO> list = new ArrayList<>();
+        List<CustomizeFielObjectDTO> list;
         StringBuilder stringBuilder = new StringBuilder();
         try {
-            stringBuilder.append(" with column_name_temp as (");
-            stringBuilder.append("    select 'CUSTOMER_ID'  ,1 isFix from user_tab_columns, dual");
-            stringBuilder.append(" union all");
-            stringBuilder.append("    select 'CUSTOMER_NAME' ,1 isFix from user_tab_columns, dual");
-            stringBuilder.append(" union all");
-            stringBuilder.append("     select 'CUSTOMER_TYPE'  ,1 isFix from user_tab_columns, dual");
-            stringBuilder.append(" union all");
-            stringBuilder.append("     select 'NAME'   ,1 isFix from user_tab_columns, dual");
-            stringBuilder.append(" union all");
-            stringBuilder.append("     select 'CURRENT_ADDRESS', 1 isFix from user_tab_columns, dual");
-            stringBuilder.append(" union all");
-            stringBuilder.append("     select 'PLACE_OF_BIRTH', 1 isFix from user_tab_columns, dual");
-            stringBuilder.append(" union all");
-            stringBuilder.append("     select 'DATE_OF_BIRTH', 1 isFix from user_tab_columns, dual");
-            stringBuilder.append(" union all");
-            stringBuilder.append("     select 'MOBILE_NUMBER', 1 isFix from user_tab_columns, dual");
-            stringBuilder.append(" union all");
-            stringBuilder.append("     select 'EMAIL', 1 isFix from user_tab_columns, dual");
-            stringBuilder.append(" union all");
-            stringBuilder.append("     select 'USERNAME', 1 isFix from user_tab_columns, dual");
-            stringBuilder.append(" union all");
-            stringBuilder.append("     select 'CUSTOMER_TYPE', 1 isFix from user_tab_columns, dual");
-            stringBuilder.append("     where table_name = 'CUSTOMER'");
-            stringBuilder.append(" )");
-
-            stringBuilder.append(" select * from column_name_temp");
-            stringBuilder.append(" union all");
-            stringBuilder.append(" select title columnName, 0 isFix ");
-            stringBuilder.append(" from customize_fields, dual");
-            stringBuilder.append(" where function_code = 'CUSTOMER'");
-            stringBuilder.append("     and site_id = :p_company_site_id");
-            stringBuilder.append("     and STATUS = 1");
+//            stringBuilder.append(" with column_name_temp as (");
+//            stringBuilder.append("    select 'CUSTOMER_ID'  ,1 isFix from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("    select 'CUSTOMER_NAME' ,1 isFix from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("     select 'CUSTOMER_TYPE'  ,1 isFix from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("     select 'NAME'   ,1 isFix from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("     select 'CURRENT_ADDRESS', 1 isFix from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("     select 'PLACE_OF_BIRTH', 1 isFix from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("     select 'DATE_OF_BIRTH', 1 isFix from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("     select 'MOBILE_NUMBER', 1 isFix from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("     select 'EMAIL', 1 isFix from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("     select 'USERNAME', 1 isFix from user_tab_columns, dual");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append("     select 'CUSTOMER_TYPE', 1 isFix from user_tab_columns, dual");
+//            stringBuilder.append("     where table_name = 'CUSTOMER'");
+//            stringBuilder.append(" )");
+//
+//            stringBuilder.append(" select * from column_name_temp");
+//            stringBuilder.append(" union all");
+//            stringBuilder.append(" select title columnName, 0 isFix ");
+//            stringBuilder.append(" from customize_fields, dual");
+//            stringBuilder.append(" where function_code = 'CUSTOMER'");
+//            stringBuilder.append("     and site_id = :p_company_site_id");
+//            stringBuilder.append("     and STATUS = 1");
+//            stringBuilder.append("   and active = 1 ");
+            stringBuilder.append("SELECT C.NAME name," +
+                    "       C.CUSTOMER_ID customerID," +
+                    "       C.CURRENT_ADDRESS currentAddress," +
+                    "       C.USERNAME username," +
+                    "       C.GENDER gender," +
+                    "       C.COMPANY_NAME companyName" +
+                    "       C.DATE_OF_BIRTH dateOfBirth," +
+                    "       C.COMPANY_NAME companyName," +
+                    "       C.CUSTOMER_TYPE customerType," +
+                    "       C.PLACE_OF_BIRTH placeOfBirth," +
+                    "       C.CUSTOMER_TYPE customerType," +
+                    "       C.EMAIL email," +
+                    "       C.USERNAME username" +
+                    "       C.NAME name," +
+                    "       C.MOBILE_NUMBER mobileNumber," +
+                    "       C.SITE_ID siteId," +
+                    "       C.STATUS status," +
+                    "       CF.FUNCTION_CODE functionCode," +
+                    "       CFO.ACTIVE active" +
+                    "       CFO.*");
+            stringBuilder.append("FROM CUSTOMER C");
+            stringBuilder.append("  INNER JOIN CUSTOMIZE_FIELD_OBJECT CFO ON C.CUSTOMER_ID = CFO.OBJECT_ID");
+            stringBuilder.append("   INNER JOIN CUSTOMIZE_FIELDS CF ON CF.CUSTOMIZE_FIELD_ID = CFO.CUSTOMIZE_FIELDS_ID\n" +
+                    "WHERE 1 = 1");
+//            stringBuilder.append("     and C.SITE_ID = :p_company_site_id");
+            stringBuilder.append("     and CFO.STATUS = 1");
             stringBuilder.append("   and active = 1 ");
-            params.put("p_company_site_id", customizeFields.getCompanySiteId());
+            stringBuilder.append("  and  CF.FUNCTION_CODE = 'CUSTOMER' ");
+            params.put("p_company_site_id", customizeFields.getSiteId());
             params.put("p_customer_id", customizeFields.getCustomerId());
-            list = namedParameterJdbcTemplate.query(stringBuilder.toString(), params, BeanPropertyRowMapper.newInstance(FieldsToShowDTO.class));
+            LOGGER.info("SQL statement: " + stringBuilder);
+            list = namedParameterJdbcTemplate.query(stringBuilder.toString(), params, BeanPropertyRowMapper.newInstance(CustomizeFielObjectDTO.class));
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             resultDTO.setDescription(Constants.ApiErrorDesc.SUCCESS);
             resultDTO.setListData(list);
@@ -1756,6 +1785,10 @@ public class CustomerServiceImpl implements CustomerService {
 
     }
 
+    @Override
+    public ResultDTO searchCustomizeFields(CustomizeRequestDTo customizeRequestDTo) {
+        ResultDTO resultDTO = new ResultDTO();
+        return resultDTO;
 
-
-}
+    }
+    }

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

@@ -5,13 +5,14 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.io.Serializable;
 import java.util.Date;
 
 @Getter
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
-public class CustomizeFielObjectDTO {
+public class CustomizeFielObjectDTO implements Serializable {
     private Long customerId;
     private String name;
     private String companyName;
@@ -40,4 +41,6 @@ public class CustomizeFielObjectDTO {
     private Long fieldOptionValueId;
     private String title;
     private String functionCode;
+    private  String active;
+
 }

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

@@ -5,13 +5,26 @@ import com.viettel.campaign.web.dto.BaseDTO;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 @Getter
 @Setter
 public class CustomizeRequestDTo extends BaseDTO {
     String operatorLogic;
+    String name;
     String filterCustomer;
     String compare;
     String valueCustomer;
-    String companySiteId;
     String customerId;
+    String companyName;
+    String status;
+    String siteId;
+    Short gender;
+    String currentAddress;
+    String placeOfBirth;
+    Date dateOfBirth;
+    String mobileNumber;
+    String email;
+    String userName;
+    Long customerType;
 }

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

@@ -3,6 +3,8 @@ package com.viettel.campaign.web.rest;
 import com.viettel.campaign.model.ccms_full.Customer;
 import com.viettel.campaign.model.ccms_full.CustomizeFieldObject;
 import com.viettel.campaign.model.ccms_full.CustomizeFields;
+import com.viettel.campaign.repository.ccms_full.CustomerQueryRepository;
+import com.viettel.campaign.repository.ccms_full.impl.CustomerQueryRepositoryImpl;
 import com.viettel.campaign.service.CustomerService;
 import com.viettel.campaign.utils.BundleUtils;
 import com.viettel.campaign.utils.Config;
@@ -38,6 +40,7 @@ import java.util.*;
 @RequestMapping("/ipcc/customer")
 @CrossOrigin(origins = "*")
 public class CustomerController {
+    private CustomerQueryRepository  customerQueryRepo;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CustomerController.class);
 
@@ -113,6 +116,7 @@ public class CustomerController {
         // VIẾT ĐI VIẾT LẠI 4 LẦN RỒI ĐẤY
         String xAuthToken = request.getHeader("X-Auth-Token");
         UserSession userSession = (UserSession) RedisUtil.getInstance().get(xAuthToken);
+
         if (userSession == null) {
             userSession = new UserSession();
             userSession.setSiteId(customerListDTO.getCompanySiteId());
@@ -248,6 +252,8 @@ public class CustomerController {
         return new ResponseEntity<>(data, HttpStatus.OK);
     }
 
+
+
     private String saveUploadFile(MultipartFile file) {
         try {
             String currentTime = new SimpleDateFormat("yyyy_MM_dd_hh_mm_ss").format(new Date());
@@ -267,6 +273,15 @@ public class CustomerController {
         }
         return null;
     }
+
+//    @GetMapping("/query")
+//    public ResponseEntity<List<Customer>> query(@RequestParam(value = "search") String query) {
+//        List<Customer> things = customerQueryRepo.findAll(query);
+//        if (things.isEmpty()) {
+//            return ResponseEntity.noContent().build();
+//        }
+//        return ResponseEntity.ok(things);
+//    }
     @GetMapping(path = "", produces = { MediaType.APPLICATION_JSON_VALUE })
     public ResponseEntity<List<Customer>> query(@RequestParam(value = "search") String query) {
         List<Customer> result = null;
@@ -282,7 +297,7 @@ public class CustomerController {
     @PostMapping("/getCustomizeFields")
     @ResponseBody
     public ResponseEntity<?> getListFieldsToShow(@RequestBody CustomizeRequestDTo customizeRequestDTo) {
-        ResultDTO resultDTO = customerService.searchCustomizeFields(customizeRequestDTo);
+        ResultDTO resultDTO = customerService.listCustomizeFields(customizeRequestDTo);
         return new ResponseEntity<>(resultDTO, HttpStatus.OK);
     }
 }