Merge branch 'master' of https://git.myitsol.com/hanv/service-campaign

campaign.iml

-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="ExternalSystem" externalSystem="Maven" />
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-    <facet type="web" name="Web">
-      <configuration>
-        <webroots />
-        <sourceRoots>
-          <root url="file://$MODULE_DIR$/src/main/java" />
-          <root url="file://$MODULE_DIR$/src/main/resources" />
-        </sourceRoots>
-      </configuration>
-    </facet>
-  </component>
-</module>
\ No newline at end of file

src/main/java/com/viettel/campaign/domain/ApParam.java

-package com.viettel.campaign.domain;
-
-
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "AP_PARAM")
-@Getter
-@Setter
-@NoArgsConstructor
-public class ApParam implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @GeneratedValue(generator="AP_PARAM_SEQ")
-    @SequenceGenerator(name="AP_PARAM_SEQ",sequenceName="AP_PARAM_SEQ", allocationSize=1)
-    @Basic(optional = false)
-    @NotNull
-    @Column(name = "AP_PARAM_ID")
-    private String apParamId;
-
-    @Column(name = "PAR_NAME")
-    private String parName;
-
-    @Column(name = "PAR_VALUE")
-    private String parValue;
-
-    @Column(name = "RESOURCE_ID")
-    private String resourceId;
-
-    @Column(name = "STATUS")
-    private String status;
-
-    @Column(name = "PAR_CODE")
-    private String parCode;
-
-    @Column(name = "PAR_TYPE")
-    private String parType;
-
-    @Column(name = "DESCRIPTION")
-    private String description;
-
-    @Column(name = "IS_DELETE")
-    private String isDelete;
-
-    @Column(name = "IS_DEFAULT")
-    private String isDefault;
-
-    @Column(name = "ENABLE_EDIT")
-    private String enableEdit;
-
-    @Column(name = "COMPANY_SITE_ID")
-    private String companySiteId;
-
-}

src/main/java/com/viettel/campaign/mapper/ApParamMapper.java

 package com.viettel.campaign.mapper;
 
-import com.viettel.campaign.dto.ApParamDTO;
+import com.viettel.campaign.web.dto.ApParamDTO;
 import com.viettel.campaign.model.ApParam;
 
 public class ApParamMapper extends BaseMapper<ApParam, ApParamDTO> {

src/main/java/com/viettel/campaign/mapper/BaseMapper.java

 package com.viettel.campaign.mapper;
 
-import com.viettel.campaign.dto.BaseDTO;
+import com.viettel.campaign.web.dto.BaseDTO;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/viettel/campaign/mapper/CampaignCompleteCodeMapper.java

 package com.viettel.campaign.mapper;
 
-import com.viettel.campaign.dto.CampaignCompleteCodeDTO;
+import com.viettel.campaign.web.dto.CampaignCompleteCodeDTO;
 import com.viettel.campaign.model.CampaignCompleteCode;
 
 public class CampaignCompleteCodeMapper extends BaseMapper<CampaignCompleteCode, CampaignCompleteCodeDTO> {

src/main/java/com/viettel/campaign/mapper/CustomerMapper.java

 package com.viettel.campaign.mapper;
 
-import com.viettel.campaign.dto.CustomerDTO;
+import com.viettel.campaign.web.dto.CustomerDTO;
 import com.viettel.campaign.model.Customer;
 
 public class CustomerMapper extends BaseMapper<Customer, CustomerDTO> {

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

 package com.viettel.campaign.service;
 
-import com.viettel.campaign.dto.ApParamDTO;
-import com.viettel.campaign.dto.ResultDTO;
+import com.viettel.campaign.web.dto.ApParamDTO;
+import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.model.ApParam;
 
 import java.util.List;

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

 package com.viettel.campaign.service;
 
-import com.viettel.campaign.dto.ApParamDTO;
-import com.viettel.campaign.dto.ResultDTO;
+import com.viettel.campaign.web.dto.ApParamDTO;
+import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.mapper.ApParamMapper;
 import com.viettel.campaign.model.ApParam;
 import com.viettel.campaign.repository.ApParamRepository;

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

 package com.viettel.campaign.service;
 
-import com.viettel.campaign.dto.CampaignCompleteCodeDTO;
-import com.viettel.campaign.dto.ResultDTO;
+import com.viettel.campaign.web.dto.CampaignCompleteCodeDTO;
+import com.viettel.campaign.web.dto.ResultDTO;
 
 import java.util.Map;
 

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

 package com.viettel.campaign.service;
 
-import com.viettel.campaign.dto.CampaignCompleteCodeDTO;
-import com.viettel.campaign.dto.ResultDTO;
+import com.viettel.campaign.web.dto.CampaignCompleteCodeDTO;
+import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.mapper.CampaignCompleteCodeMapper;
 import com.viettel.campaign.model.CampaignCompleteCode;
 import com.viettel.campaign.repository.CampaignCompleteCodeRepository;

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

 package com.viettel.campaign.service;
 
-import com.viettel.campaign.dto.CustomerDTO;
-import com.viettel.campaign.dto.ResultDTO;
+import com.viettel.campaign.web.dto.CustomerDTO;
+import com.viettel.campaign.web.dto.ResultDTO;
 
 import java.util.Map;
 

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

 package com.viettel.campaign.service;
 
-import com.viettel.campaign.dto.CustomerDTO;
-import com.viettel.campaign.dto.ResultDTO;
+import com.viettel.campaign.web.dto.CustomerDTO;
+import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.mapper.CustomerMapper;
 import com.viettel.campaign.model.Customer;
 import com.viettel.campaign.repository.CustomerRepository;

src/main/java/com/viettel/campaign/dto/ApParamDTO.java → src/main/java/com/viettel/campaign/web/dto/ApParamDTO.java

-package com.viettel.campaign.dto;
+package com.viettel.campaign.web.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/viettel/campaign/dto/BaseDTO.java → src/main/java/com/viettel/campaign/web/dto/BaseDTO.java

-package com.viettel.campaign.dto;
+package com.viettel.campaign.web.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/viettel/campaign/dto/CampaignCompleteCodeDTO.java → src/main/java/com/viettel/campaign/web/dto/CampaignCompleteCodeDTO.java

-package com.viettel.campaign.dto;
+package com.viettel.campaign.web.dto;
 
 import lombok.Getter;
 import lombok.Setter;

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

-package com.viettel.campaign.dto;
+package com.viettel.campaign.web.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/viettel/campaign/dto/CustomerDTO.java → src/main/java/com/viettel/campaign/web/dto/CustomerDTO.java

-package com.viettel.campaign.dto;
+package com.viettel.campaign.web.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/viettel/campaign/dto/CustomerListDTO.java → src/main/java/com/viettel/campaign/web/dto/CustomerListDTO.java

-package com.viettel.campaign.dto;
+package com.viettel.campaign.web.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/viettel/campaign/dto/ResultDTO.java → src/main/java/com/viettel/campaign/web/dto/ResultDTO.java

-package com.viettel.campaign.dto;
+package com.viettel.campaign.web.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/viettel/campaign/dto/TicketSiteDTO.java → src/main/java/com/viettel/campaign/web/dto/TicketSiteDTO.java

-package com.viettel.campaign.dto;
+package com.viettel.campaign.web.dto;
 
 import lombok.Getter;
 import lombok.Setter;

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

-package com.viettel.campaign.controller;
+package com.viettel.campaign.web.rest;
 
 import com.viettel.campaign.model.ApParam;
 import com.viettel.campaign.service.ApParamService;

src/main/java/com/viettel/campaign/controller/CampaignCompleteCodeController.java → src/main/java/com/viettel/campaign/web/rest/CampaignCompleteCodeController.java

-package com.viettel.campaign.controller;
+package com.viettel.campaign.web.rest;
 
-import com.viettel.campaign.dto.CampaignCompleteCodeDTO;
-import com.viettel.campaign.dto.ResultDTO;
+import com.viettel.campaign.web.dto.CampaignCompleteCodeDTO;
+import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.service.CampaignCompleteCodeService;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

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

-package com.viettel.campaign.controller;
+package com.viettel.campaign.web.rest;
 
-import com.viettel.campaign.dto.CustomerDTO;
-import com.viettel.campaign.dto.ResultDTO;
+import com.viettel.campaign.web.dto.CustomerDTO;
+import com.viettel.campaign.web.dto.ResultDTO;
 import com.viettel.campaign.service.CustomerService;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/viettel/campaign/web/controller/KafkaController.java → src/main/java/com/viettel/campaign/web/rest/KafkaController.java

-package com.viettel.campaign.web.controller;
+package com.viettel.campaign.web.rest;
 
 import com.viettel.campaign.service.Sender;
 import com.viettel.campaign.service.Producer;
@@ -6,8 +6,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import org.apache.log4j.Logger;
-
 /**
  * @author hanv_itsol
  * @project service-campaign
@@ -18,7 +16,6 @@ import org.apache.log4j.Logger;
 public class KafkaController {
 
     private final Sender sender;
-    private static final Logger log = Logger.getLogger(KafkaController.class);
 
     private final Producer producer;