anhvd accept merge

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/CampaignRepositoryImpl.java

@@ -638,6 +638,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
                     "),\n" +
                     "data as (\n" +
                     "select a.*, rownum row_ from data_temp a\n" +
+                    "where a.totalCusList > 0" +
                     "),\n" +
                     "count_data as (\n" +
                     "select count(*) totalRow from data_temp\n" +

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/CampaignServiceImpl.java

@@ -555,6 +555,7 @@ public class CampaignServiceImpl implements CampaignService {
                 List<CampaignCustomer> list = campaignCustomerRepository.findCustomerContacted(campaignId, companySiteId, Long.parseLong(cusListId));
                 for (CampaignCustomer campaignCustomer: list) {
                     campaignCustomer.setInCampaignStatus((short) 0);
+                    campaignCustomerRepository.save(campaignCustomer);
                 }
             }
             resultDTO.setErrorCode(Constants.ApiErrorCode.SUCCESS);

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 {
+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);
     }
 }

src/main/resources/i18n/language_vi.properties

@@ -62,13 +62,13 @@ DATE_OF_BIRTH = Ngày sinh
 MOBILE_NUMBER = Số điện thoại
 USERNAME = Tài khoản
 AREA_CODE = Khu vực
-CALL_ALLOWED = CALL_ALLOWED
-EMAIL_ALLOWED = EMAIL_ALLOWED
-SMS_ALLOWED = SMS_ALLOWED
-IPCC_STATUS = IPCC_STATUS
-EMAIL = EMAIL
-CUSTOMER_TYPE = CUSTOMER_TYPE
-AVATAR_LINK = AVATAR_LINK
+CALL_ALLOWED = Cho phép gọi
+EMAIL_ALLOWED = Cho phép gửi email
+SMS_ALLOWED = Cho phép gửi sms
+IPCC_STATUS = Trạng thái Ipcc
+EMAIL = Email
+CUSTOMER_TYPE = Loại khách hàng
+AVATAR_LINK = Đường dẫn ảnh đại diện
 
 #Customer Excel Header
 customer.no = STT