Commit 4b201f38 authored by ='s avatar =

Merge remote-tracking branch 'origin/master'

parents 295d13ca bf23537e
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
<dependency> <dependency>
<groupId>com.oracle</groupId> <groupId>com.oracle</groupId>
<artifactId>ojdbc7</artifactId> <artifactId>ojdbc7</artifactId>
<!-- <scope>system</scope>--> <scope>system</scope>
<!-- <systemPath>${project.basedir}/lib/ojdbc7.jar</systemPath>--> <systemPath>${project.basedir}/lib/ojdbc7.jar</systemPath>
<version>1.0</version> <version>1.0</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -121,6 +121,12 @@ ...@@ -121,6 +121,12 @@
<artifactId>poi</artifactId> <artifactId>poi</artifactId>
<version>3.17</version> <version>3.17</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml --> <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
<dependency> <dependency>
<groupId>org.apache.poi</groupId> <groupId>org.apache.poi</groupId>
......
...@@ -21,7 +21,7 @@ public class CustomerMapper extends BaseMapper<Customer, CustomerDTO> { ...@@ -21,7 +21,7 @@ public class CustomerMapper extends BaseMapper<Customer, CustomerDTO> {
obj.setMobileNumber(model.getMobileNumber()); obj.setMobileNumber(model.getMobileNumber());
obj.setName(model.getName()); obj.setName(model.getName());
obj.setSiteId(model.getSiteId()); obj.setSiteId(model.getSiteId());
obj.setStatus(model.getStatus()); obj.setStatus(model.getStatus().toString());
// String additionalInfo = ""; // String additionalInfo = "";
// if (model.getName() != null && !"".equals(model.getName())) { // if (model.getName() != null && !"".equals(model.getName())) {
// additionalInfo += model.getName(); // additionalInfo += model.getName();
...@@ -58,7 +58,7 @@ public class CustomerMapper extends BaseMapper<Customer, CustomerDTO> { ...@@ -58,7 +58,7 @@ public class CustomerMapper extends BaseMapper<Customer, CustomerDTO> {
obj.setCustomerImg(dtoBean.getCustomerImg()); obj.setCustomerImg(dtoBean.getCustomerImg());
obj.setCreateDate(dtoBean.getCreateDate()); obj.setCreateDate(dtoBean.getCreateDate());
obj.setUpdateDate(dtoBean.getUpdateDate()); obj.setUpdateDate(dtoBean.getUpdateDate());
obj.setStatus(dtoBean.getStatus()); obj.setStatus(Long.parseLong(dtoBean.getStatus()));
obj.setCreateBy(dtoBean.getCreateBy()); obj.setCreateBy(dtoBean.getCreateBy());
obj.setUpdateBy(dtoBean.getUpdateBy()); obj.setUpdateBy(dtoBean.getUpdateBy());
obj.setSiteId(dtoBean.getSiteId()); obj.setSiteId(dtoBean.getSiteId());
...@@ -71,7 +71,7 @@ public class CustomerMapper extends BaseMapper<Customer, CustomerDTO> { ...@@ -71,7 +71,7 @@ public class CustomerMapper extends BaseMapper<Customer, CustomerDTO> {
obj.setUserName(dtoBean.getUserName()); obj.setUserName(dtoBean.getUserName());
obj.setAreaCode(dtoBean.getAreaCode()); obj.setAreaCode(dtoBean.getAreaCode());
obj.setCustomerType(dtoBean.getCustomerType()); obj.setCustomerType(dtoBean.getCustomerType());
obj.setCallAllowed(dtoBean.getCallAllowed()); obj.setCallAllowed(Long.parseLong(dtoBean.getCallAllowed()));
obj.setEmailAllowed(dtoBean.getEmailAllowed()); obj.setEmailAllowed(dtoBean.getEmailAllowed());
obj.setSmsAllowed(dtoBean.getSmsAllowed()); obj.setSmsAllowed(dtoBean.getSmsAllowed());
obj.setIpccStatus(dtoBean.getIpccStatus()); obj.setIpccStatus(dtoBean.getIpccStatus());
......
...@@ -45,7 +45,7 @@ public class Customer implements Serializable { ...@@ -45,7 +45,7 @@ public class Customer implements Serializable {
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date updateDate; private Date updateDate;
@Column(name = "STATUS") @Column(name = "STATUS")
private String status; private Long status;
@Size(max = 50) @Size(max = 50)
@Column(name = "CREATE_BY") @Column(name = "CREATE_BY")
private String createBy; private String createBy;
...@@ -80,7 +80,7 @@ public class Customer implements Serializable { ...@@ -80,7 +80,7 @@ public class Customer implements Serializable {
@Column(name = "CUSTOMER_TYPE") @Column(name = "CUSTOMER_TYPE")
private Long customerType; private Long customerType;
@Column(name = "CALL_ALLOWED") @Column(name = "CALL_ALLOWED")
private String callAllowed; private Long callAllowed;
@Column(name = "EMAIL_ALLOWED") @Column(name = "EMAIL_ALLOWED")
private Long emailAllowed; private Long emailAllowed;
@Column(name = "SMS_ALLOWED") @Column(name = "SMS_ALLOWED")
...@@ -88,4 +88,7 @@ public class Customer implements Serializable { ...@@ -88,4 +88,7 @@ public class Customer implements Serializable {
@Size(max = 100) @Size(max = 100)
@Column(name = "IPCC_STATUS") @Column(name = "IPCC_STATUS")
private String ipccStatus; private String ipccStatus;
@Size(max = 2000)
@Column(name = "AVATAR_LINK")
private String avatarLink;
} }
...@@ -43,4 +43,6 @@ public class CustomerContact { ...@@ -43,4 +43,6 @@ public class CustomerContact {
@Column(name = "END_DATE") @Column(name = "END_DATE")
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date endDate; private Date endDate;
@Column(name = "SITE_ID")
private Long siteId;
} }
package com.viettel.campaign.model.ccms_full; package com.viettel.campaign.model.ccms_full;
import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import javax.persistence.*; import javax.persistence.*;
...@@ -13,6 +15,8 @@ import java.util.Date; ...@@ -13,6 +15,8 @@ import java.util.Date;
@Table(name = "CUSTOMER_LIST") @Table(name = "CUSTOMER_LIST")
@Getter @Getter
@Setter @Setter
@NoArgsConstructor
@AllArgsConstructor
public class CustomerList implements Serializable { public class CustomerList implements Serializable {
@Id @Id
......
package com.viettel.campaign.model.ccms_full; package com.viettel.campaign.model.ccms_full;
import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import javax.persistence.Column; import javax.persistence.*;
import javax.persistence.Entity; import javax.validation.constraints.NotNull;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable; import java.io.Serializable;
@Entity @Entity
@Table(name = "CUSTOMER_LIST_MAPPING") @Table(name = "CUSTOMER_LIST_MAPPING")
@Getter @Getter
@Setter @Setter
@NoArgsConstructor
@AllArgsConstructor
public class CustomerListMapping implements Serializable { public class CustomerListMapping implements Serializable {
@Id @Id
@GeneratedValue(generator = "customer_list_mapping_seq")
@SequenceGenerator(name = "customer_list_mapping_seq", sequenceName = "customer_list_mapping_seq", allocationSize = 1)
@Basic(optional = false)
@NotNull
@Column(name = "CUSTOMER_LIST_MAPPING_ID") @Column(name = "CUSTOMER_LIST_MAPPING_ID")
private Long customerListMappingId; private Long customerListMappingId;
@NotNull
@Column(name = "CUSTOMER_ID") @Column(name = "CUSTOMER_ID")
private Long customerId; private Long customerId;
@Column(name = "COMPANY_SITE_ID") @Column(name = "COMPANY_SITE_ID")
private Long companySiteId; private Long companySiteId;
@NotNull
@Column(name = "CUSTOMER_LIST_ID") @Column(name = "CUSTOMER_LIST_ID")
private Long customerListId; private Long customerListId;
} }
package com.viettel.campaign.web.dto; package com.viettel.campaign.model.ccms_full;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
@Entity
@Table(name = "CUSTOMIZE_FIELD_OBJECT")
@Getter @Getter
@Setter @Setter
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class CustomizeFieldDTO { public class CustomizeFieldObject implements Serializable {
@Id
@GeneratedValue(generator = "CUSTOMIZE_FIELD_OBJECT_SEQ")
@SequenceGenerator(name = "CUSTOMIZE_FIELD_OBJECT_SEQ", sequenceName = "CUSTOMIZE_FIELD_OBJECT_SEQ", allocationSize = 1)
@Basic(optional = false)
@NotNull
@Column(name = "CUSTOMIZE_FIELD_OBJECT_ID")
private Long customizeFieldObjectId; private Long customizeFieldObjectId;
@Column(name = "OBJECT_ID")
private Long objectId; private Long objectId;
@Column(name = "CUSTOMIZE_FIELDS_ID")
private Long customizeFieldId; private Long customizeFieldId;
@Column(name = "VALUE_TEXT")
private String valueText; private String valueText;
@Column(name = "VALUE_NUMBER")
private Long valueNumber; private Long valueNumber;
@Column(name = "VALUE_DATE")
private Date valueDate; private Date valueDate;
@Column(name = "VALUE_CHECKBOX")
private Long valueCheckbox; private Long valueCheckbox;
private Date createBy; @Column(name = "CREATE_BY")
private String createBy;
@Column(name = "CREATE_DATE")
@Temporal(TemporalType.TIMESTAMP)
private Date createDate; private Date createDate;
@Column(name = "UPDATE_BY")
private String updateBy; private String updateBy;
@Column(name = "UPDATE_DATE")
private Date updateDate; private Date updateDate;
@Column(name = "STATUS")
private Long status; private Long status;
@Column(name = "FIELD_OPTION_VALUE_ID")
private Long fieldOptionValueId; private Long fieldOptionValueId;
@Column(name = "TITLE")
private String title; private String title;
@Column(name = "FUNCTION_CODE")
private String functionCode; private String functionCode;
} }
package com.viettel.campaign.model.ccms_full;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
@Entity
@Table(name = "CUSTOMIZE_FIELD_OPTION_VALUE")
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
public class CustomizeFieldOptionValue implements Serializable {
@Id
@Column(name = "FIELD_OPTION_VALUE_ID")
@Basic(optional = false)
@NotNull
private Long fieldOptionValueId;
@Column(name = "FIELD_OPTION_ID")
private Long fieldOptionId;
@Column(name = "NAME")
private String name;
@Column(name = "VALUE")
private String value;
@Column(name = "POSITION")
private Long position;
@Column(name = "CREATE_BY")
private String createBy;
@Column(name = "CREATE_DATE")
@Temporal(TemporalType.TIMESTAMP)
private Date createDate;
@Column(name = "UPDATE_BY")
private String updateBy;
@Column(name = "UPDATE_DATE")
@Temporal(TemporalType.TIMESTAMP)
private Date updateDate;
@Column(name = "STATUS")
private Long status;
}
package com.viettel.campaign.web.dto; package com.viettel.campaign.model.ccms_full;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
@Entity
@Table(name = "CUSTOMIZE_FIELDS")
@Getter @Getter
@Setter @Setter
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class DynamicExcelHeaderDTO { public class CustomizeFields implements Serializable {
@Id
@GeneratedValue(generator = "CUSTOMIZE_FIELDS_SEQ")
@SequenceGenerator(name = "CUSTOMIZE_FIELDS_SEQ", sequenceName = "CUSTOMIZE_FIELDS_SEQ", allocationSize = 1)
@Basic(optional = false)
@NotNull
@Column(name = "CUSTOMIZE_FIELD_ID")
private Long customizeFieldId; private Long customizeFieldId;
@Column(name = "SITE_ID")
private Long siteId; private Long siteId;
@Column(name = "FUNCTION_CODE")
private String functionCode; private String functionCode;
@Column(name = "CREATE_BY")
private String createBy; private String createBy;
@Column(name = "CREATE_DATE")
@Temporal(TemporalType.TIMESTAMP)
private Date createDate; private Date createDate;
@Column(name = "UPDATE_BY")
private String updateBy; private String updateBy;
@Column(name = "UPDATE_DATE")
@Temporal(TemporalType.TIMESTAMP)
private Date updateDate; private Date updateDate;
@Column(name = "STATUS")
private Long status; private Long status;
@Column(name = "TYPE")
private String type; private String type;
@Column(name = "TITLE")
private String title; private String title;
@Column(name = "PLACEHOLDER")
private String placeholder; private String placeholder;
@Column(name = "DESCRIPTION")
private String description; private String description;
@Column(name = "POSITION")
private Long position; private Long position;
@Column(name = "REQUIRED")
private Long required; private Long required;
@Column(name = "FIELD_OPTIONS_ID")
private Long fieldOptionsId; private Long fieldOptionsId;
@Column(name = "REGEXP_FOR_VALIDATION")
private String regexpForValidation; private String regexpForValidation;
@Column(name = "MAX_LENGTH")
private Long maxLength; private Long maxLength;
@Column(name = "MIN_LENGTH")
private Long minLength; private Long minLength;
@Column(name = "MIN")
private Long min; private Long min;
@Column(name = "MAX")
private Long max; private Long max;
@Column(name = "ACTIVE")
private Long active; private Long active;
public CustomizeFields(String type, String title) {
this.type = type;
this.title = title;
}
} }
...@@ -11,4 +11,6 @@ import java.util.List; ...@@ -11,4 +11,6 @@ import java.util.List;
public interface CustomerContactRepository extends JpaRepository<CustomerContact, Long> { public interface CustomerContactRepository extends JpaRepository<CustomerContact, Long> {
@Query("FROM CustomerContact WHERE status = 1 AND customerId = :customerId AND contactType = :contactType AND (contact IS NULL OR UPPER(contact) LIKE UPPER(concat('%', :contact, '%')))") @Query("FROM CustomerContact WHERE status = 1 AND customerId = :customerId AND contactType = :contactType AND (contact IS NULL OR UPPER(contact) LIKE UPPER(concat('%', :contact, '%')))")
List<CustomerContact> findByCustomerIdAndAndContactTypeAndContact(@Param("customerId") Long customerId, @Param("contactType") Short contactType, @Param("contact") String contact, Pageable pageable); List<CustomerContact> findByCustomerIdAndAndContactTypeAndContact(@Param("customerId") Long customerId, @Param("contactType") Short contactType, @Param("contact") String contact, Pageable pageable);
CustomerContact findCustomerContactByContactTypeAndContactAndIsDirectLine(Short contactType, String contact, Short isDirectLine);
} }
package com.viettel.campaign.repository.ccms_full;
import com.viettel.campaign.model.ccms_full.CustomizeFieldObject;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface CustomizeFieldObjectRepository extends JpaRepository<CustomizeFieldObject, Long> {
List<CustomizeFieldObject> findCustomizeFieldObjectsByFunctionCodeEqualsAndObjectId(String str, Long id);
}
package com.viettel.campaign.repository.ccms_full;
import com.viettel.campaign.model.ccms_full.CustomizeFieldOptionValue;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface CustomizeFieldOptionValueRepository extends JpaRepository<CustomizeFieldOptionValue, Long> {
List<CustomizeFieldOptionValue> findCustomizeFieldOptionValuesByFieldOptionIdAndStatus(Long id, Long status);
CustomizeFieldOptionValue findCustomizeFieldOptionValueByNameEqualsAndStatus(String name, Long status);
}
package com.viettel.campaign.repository.ccms_full;
import com.viettel.campaign.model.ccms_full.CustomizeFields;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface CustomizeFieldsRepository extends JpaRepository<CustomizeFields, Long> {
List<CustomizeFields> findCustomizeFieldsByFunctionCodeEqualsAndStatusAndActiveAndSiteId(String functionCode, Long status, Long active, Long siteId);
}
...@@ -2,15 +2,15 @@ package com.viettel.campaign.service; ...@@ -2,15 +2,15 @@ package com.viettel.campaign.service;
import com.viettel.campaign.model.ccms_full.Customer; import com.viettel.campaign.model.ccms_full.Customer;
import com.viettel.campaign.model.ccms_full.CustomerList; import com.viettel.campaign.model.ccms_full.CustomerList;
import com.viettel.campaign.model.ccms_full.CustomizeFieldObject;
import com.viettel.campaign.model.ccms_full.CustomizeFields;
import com.viettel.campaign.web.dto.*; import com.viettel.campaign.web.dto.*;
import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO; import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO; import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
import java.io.File;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.List;
public interface CustomerService { public interface CustomerService {
...@@ -62,9 +62,11 @@ public interface CustomerService { ...@@ -62,9 +62,11 @@ public interface CustomerService {
List<Customer> findAllByCondition(Long siteId, Date endTime); List<Customer> findAllByCondition(Long siteId, Date endTime);
Customer update(Customer c); Customer update(Customer c);
List<DynamicExcelHeaderDTO> getDynamicHeader(Long companySiteId); List<CustomizeFields> getDynamicHeader(Long companySiteId);
byte[] buildTemplate(Long companySiteId);
void buildTemplate(Long companySiteId); Map<String, Object> readAndValidateCustomer(String path, List<CustomizeFields> headerDTOS, Long companySiteId);
List<CustomizeFieldDTO> getCustomizeField(Long customerId); List<CustomizeFieldObject> getCustomizeField(Long customerId);
} }
...@@ -13,14 +13,15 @@ import java.util.ResourceBundle; ...@@ -13,14 +13,15 @@ import java.util.ResourceBundle;
public class BundleUtils { public class BundleUtils {
protected static final Logger logger = LoggerFactory.getLogger(BundleUtils.class); protected static final Logger logger = LoggerFactory.getLogger(BundleUtils.class);
private static volatile ResourceBundle rsConfig = null; private static volatile ResourceBundle rsConfig = null;
private static final String GLOBAL_CONFIG = "config/globalConfig";
public static String getLangString(String key, Locale... locale) { public static String getLangString(String key, Locale... locale) {
Locale vi = new Locale("vi"); Locale vi = new Locale("vi");
Locale mlocale = vi; Locale mlocale = vi;
try { try {
if(locale != null) { if (locale != null) {
if(locale.length == 0) { if (locale.length == 0) {
rsConfig = ResourceBundle.getBundle(Constants.LANGUAGE.LANGUAGE, mlocale); rsConfig = ResourceBundle.getBundle(Constants.LANGUAGE.LANGUAGE, mlocale);
} else { } else {
rsConfig = ResourceBundle.getBundle(Constants.LANGUAGE.LANGUAGE, locale[0]); rsConfig = ResourceBundle.getBundle(Constants.LANGUAGE.LANGUAGE, locale[0]);
...@@ -34,4 +35,15 @@ public class BundleUtils { ...@@ -34,4 +35,15 @@ public class BundleUtils {
return key; return key;
} }
} }
public static String getGlobalConfig(String configKey) {
String result = null;
try {
ResourceBundle bundle = ResourceBundle.getBundle(GLOBAL_CONFIG);
result = bundle.getString(configKey);
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
return result;
}
} }
...@@ -43,4 +43,8 @@ public class Constants { ...@@ -43,4 +43,8 @@ public class Constants {
public interface DATE_FORMAT { public interface DATE_FORMAT {
String FOMART_DATE_TYPE_1 = "DD/MM/YYYY"; String FOMART_DATE_TYPE_1 = "DD/MM/YYYY";
} }
public interface MIME_TYPE {
String EXCEL_XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
}
} }
package com.viettel.campaign.web.rest; package com.viettel.campaign.web.rest;
import com.viettel.campaign.model.ccms_full.CustomizeFieldObject;
import com.viettel.campaign.model.ccms_full.CustomizeFields;
import com.viettel.campaign.service.CustomerService;
import com.viettel.campaign.utils.BundleUtils;
import com.viettel.campaign.utils.Constants;
import com.viettel.campaign.utils.RedisUtil; import com.viettel.campaign.utils.RedisUtil;
import com.viettel.campaign.web.dto.*; import com.viettel.campaign.web.dto.*;
import com.viettel.campaign.service.CustomerService;
import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO; import com.viettel.campaign.web.dto.request_dto.CustomerRequestDTO;
import com.viettel.campaign.web.dto.request_dto.SearchCustomerRequestDTO;
import com.viettel.econtact.filter.UserSession; import com.viettel.econtact.filter.UserSession;
import org.apache.log4j.Logger; import org.apache.commons.io.FilenameUtils;
import org.apache.poi.xssf.usermodel.XSSFRow; import org.slf4j.Logger;
import org.apache.poi.xssf.usermodel.XSSFSheet; import org.slf4j.LoggerFactory;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.*; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.util.ResourceUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
...@@ -21,17 +25,22 @@ import javax.servlet.http.HttpServletRequest; ...@@ -21,17 +25,22 @@ import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid; import javax.validation.Valid;
import java.io.File; import java.io.File;
import java.nio.file.Files; import java.nio.file.Files;
import java.util.ArrayList; import java.nio.file.Path;
import java.nio.file.Paths;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Objects;
@Controller @Controller
@RequestMapping("/ipcc/customer") @RequestMapping("/ipcc/customer")
@CrossOrigin(origins = "*") @CrossOrigin(origins = "*")
public class CustomerController { public class CustomerController {
private static final Logger LOGGER = Logger.getLogger(CustomerController.class); private static final Logger LOGGER = LoggerFactory.getLogger(CustomerController.class);
@Autowired(required=true) @Autowired(required = true)
CustomerService customerService; CustomerService customerService;
@GetMapping("/findAll") @GetMapping("/findAll")
...@@ -160,17 +169,15 @@ public class CustomerController { ...@@ -160,17 +169,15 @@ public class CustomerController {
return new ResponseEntity(result, HttpStatus.OK); return new ResponseEntity(result, HttpStatus.OK);
} }
//<editor-fold desc="Download and import excel" defaultState="collapsed"> //<editor-fold desc="Download and import excel" defaultstate="collapsed">
@GetMapping(value = "/downloadFileTemplate") @GetMapping(value = "/downloadFileTemplate")
public ResponseEntity<byte[]> downloadFileTemplate(@RequestParam("companySiteId") Long companySiteId) { public ResponseEntity<byte[]> downloadFileTemplate(@RequestParam("companySiteId") Long companySiteId) {
LOGGER.debug("--------DOWNLOAD FILE TEMPLATE---------"); LOGGER.info("--------DOWNLOAD FILE TEMPLATE---------");
try { try {
customerService.buildTemplate(companySiteId); byte[] content = customerService.buildTemplate(companySiteId);
File file = ResourceUtils.getFile("classpath:templates/import_customer_template.xlsx");
byte[] content = Files.readAllBytes(file.toPath());
return ResponseEntity.ok() return ResponseEntity.ok()
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + file.getName()) .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=template_import_customer.xlsx")
.contentType(MediaType.APPLICATION_OCTET_STREAM) .header("Content-Type", Constants.MIME_TYPE.EXCEL_XLSX)
.body(content); .body(content);
} catch (Exception e) { } catch (Exception e) {
LOGGER.error(e.getMessage()); LOGGER.error(e.getMessage());
...@@ -179,39 +186,28 @@ public class CustomerController { ...@@ -179,39 +186,28 @@ public class CustomerController {
} }
@PostMapping(value = "/importFile") @PostMapping(value = "/importFile")
public ResponseEntity<byte[]> importFile(@RequestParam("file") MultipartFile file) { public ResponseEntity<?> importFile(@RequestParam("file") MultipartFile file,
LOGGER.debug("--------IMPORT FILE TEMPLATE---------"); @RequestParam("companySiteId") Long companySiteId,
@RequestHeader("X-Auth-Token") String authToken) {
LOGGER.info("------------IMPORT FILE TEMPLATE--------------");
try { try {
List<CustomerDTO> listCustomer = new ArrayList<>(); // UserSession userSession = (UserSession) RedisUtil.getInstance().get(authToken);
XSSFWorkbook workbook = new XSSFWorkbook(file.getInputStream()); if (file.isEmpty()) {
XSSFSheet sheet = workbook.getSheetAt(0); return new ResponseEntity<>("Please select a file", HttpStatus.OK);
for (int i = 0; i < sheet.getPhysicalNumberOfRows(); i++) {
CustomerDTO customer = new CustomerDTO();
XSSFRow row = sheet.getRow(i);
customer.setCustomerId(Double.valueOf(row.getCell(0).getNumericCellValue()).longValue());
customer.setCreateDate(row.getCell(1).getDateCellValue());
customer.setName(row.getCell(2).getStringCellValue());
listCustomer.add(customer);
} }
// for (int i = 0; i < listCustomer.size(); i++) { if (!Objects.equals(FilenameUtils.getExtension(file.getOriginalFilename()), Constants.FileType.xlsx)) {
// validate du lieu return new ResponseEntity<>("File khong dung dinh dang", HttpStatus.OK);
// } }
// if (okay) { String path = saveUploadFile(file);
// for (int i = 0; i < listCustomer.size(); i++) { List<CustomizeFields> dynamicHeaders = customerService.getDynamicHeader(companySiteId);
// customerService.createCustomer(listCustomer.get(i)); Map<String, Object> map = customerService.readAndValidateCustomer(path, dynamicHeaders, companySiteId);
// } File fileExport = (File) map.get("file");
// return ResponseEntity.ok() String message = (String) map.get("message");
// .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + file.getName()) return ResponseEntity.ok()
// .contentType(MediaType.APPLICATION_OCTET_STREAM) .header("Content-Type", Constants.MIME_TYPE.EXCEL_XLSX)
// .body(file.getBytes()); .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=template_import_customer.xlsx")
// } else { .header("Message", message)
// return ResponseEntity.ok() .body(Files.readAllBytes(fileExport.toPath()));
// .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + file.getName())
// .header("Message", "Validate failed!")
// .contentType(MediaType.APPLICATION_OCTET_STREAM)
// .body(file.getBytes());
// }
return null;
} catch (Exception e) { } catch (Exception e) {
LOGGER.error(e.getMessage()); LOGGER.error(e.getMessage());
return new ResponseEntity<>(HttpStatus.BAD_REQUEST); return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
...@@ -233,7 +229,25 @@ public class CustomerController { ...@@ -233,7 +229,25 @@ public class CustomerController {
@PostMapping("/getCustomizeField") @PostMapping("/getCustomizeField")
public ResponseEntity<?> getCustomizeField(@RequestBody Long customerId) { public ResponseEntity<?> getCustomizeField(@RequestBody Long customerId) {
List<CustomizeFieldDTO> data = customerService.getCustomizeField(customerId); List<CustomizeFieldObject> data = customerService.getCustomizeField(customerId);
return new ResponseEntity<>(data, HttpStatus.OK); 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());
String fileName = FilenameUtils.getBaseName(file.getOriginalFilename()) + "_" + currentTime + "." + FilenameUtils.getExtension(file.getOriginalFilename());
byte[] content = file.getBytes();
File uploadFolder = new File(BundleUtils.getGlobalConfig("import.uploadFolder"));
if (!uploadFolder.exists()) {
uploadFolder.mkdir();
}
Path path = Paths.get(BundleUtils.getGlobalConfig("import.uploadFolder"), fileName);
Files.write(path, content);
return path.toString();
} catch (Exception e) {
LOGGER.error(e.getMessage());
}
return null;
}
} }
#DEV
import.uploadFolder=D:/temp/upload
#STAGGING
#import.uploadFolder=/root/temp/
#PROD
#import.uploadFolder=/root/temp/
select CUSTOMIZE_FIELD_OBJECT_ID customizeFieldObjectId,
OBJECT_ID objectId,
CUSTOMIZE_FIELDS_ID customizeFieldId,
VALUE_TEXT valueText,
VALUE_NUMBER valueNumber,
VALUE_DATE valueDate,
VALUE_CHECKBOX valueCheckbox,
CREATE_BY createBy,
CREATE_DATE createDate,
UPDATE_BY updateBy,
UPDATE_DATE updateDate,
STATUS status,
FIELD_OPTION_VALUE_ID fieldOptionValueId,
TITLE title,
FUNCTION_CODE functionCode
from customize_field_object
where function_code = 'CUSTOMER' and object_id = :p_customer_id
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment