Merge remote-tracking branch 'origin/master'

pom.xml

@@ -173,6 +173,20 @@
                 <!--<executable>true</executable>-->
                 <!--</configuration>-->
             </plugin>
+
+            <!--<plugin>-->
+                <!--<groupId>org.sonarsource.scanner.maven</groupId>-->
+                <!--<artifactId>sonar-maven-plugin</artifactId>-->
+                <!--<version>3.3.0.603</version>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<phase>verify</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>sonar</goal>-->
+                        <!--</goals>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
         </plugins>
     </build>
     <repositories>

src/main/java/com/viettel/campaign/job/CampaignJob.java

@@ -19,7 +19,7 @@ import java.util.List;
 @Slf4j
 public class CampaignJob {
 
-    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy HH:mm:ss");
+    private SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy HH:mm:ss");
     private static final String CUSTOMER_INACTIVE_DUARATION =  "CUSTOMER_INACTIVE_DUARATION";
     private static final String CRON_EXPRESSION_CHECK_START =  "CRON_EXPRESSION_CHECK_START";
     private static final String CRON_EXPRESSION_CHECK_END =  "CRON_EXPRESSION_CHECK_END";

src/main/java/com/viettel/campaign/model/ccms_full/CustomerContact.java

@@ -15,7 +15,7 @@ import java.util.Date;
 public class CustomerContact implements Serializable {
     @Id
     @Basic(optional = false)
-    @GeneratedValue(generator = "customer_contact_seq", strategy = GenerationType.IDENTITY)
+    @GeneratedValue(generator = "customer_contact_seq")
     @SequenceGenerator(name = "customer_contact_seq", sequenceName = "customer_contact_seq", allocationSize = 1)
     @NotNull
     @Column(name = "CONTACT_ID")

src/main/java/com/viettel/campaign/model/ccms_full/CustomizeFields.java

 package com.viettel.campaign.model.ccms_full;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
@@ -67,8 +64,10 @@ public class CustomizeFields implements Serializable {
     @Column(name = "ACTIVE")
     private Long active;
 
-    public CustomizeFields(String type, String title) {
+    public CustomizeFields(@NotNull String type, @NotNull String title) {
         this.type = type;
         this.title = title;
     }
+
+
 }

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

@@ -27,4 +27,6 @@ public interface ScenarioAnswerRepository extends JpaRepository<ScenarioAnswer,
 
     @Query(value = "SELECT COUNT(1) FROM ScenarioAnswer WHERE 1 = 1 AND code = :code AND scenarioQuestionId = :scenarioQuestionId AND scenarioAnswerId <> :scenarioAnswerId")
     Integer countDuplicateScenarioCode(@Param("code") String code, @Param("scenarioQuestionId") Long scenarioQuestionId, @Param("scenarioAnswerId") Long scenarioAnswerId);
+
+    ScenarioAnswer findScenarioAnswerByScenarioQuestionIdAndCode(Long questionId, String code);
 }

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

@@ -23,4 +23,6 @@ public interface ScenarioQuestionRepository extends JpaRepository<ScenarioQuesti
     Integer countDuplicateQuestionCode(@Param("code") String code, @Param("scenarioId") Long scenarioId, @Param("campaignId") Long campaignId, @Param("companySiteId") Long companySiteId);
 
     ScenarioQuestion findScenarioQuestionByScenarioQuestionId(Long scenarioQuestionId);
+
+    ScenarioQuestion findScenarioQuestionByCodeAndCompanySiteId(String code, Long companySiteId);
 }

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

@@ -301,9 +301,9 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
                 if (!"AGENT".equals(dto.getRoleUser())) { // ko phải nhân viên
                     ContactCustResultDTO.setEnableEdit(true);
                 } else {
-                    if ("2".equals(ContactCustResultDTO.getRecordStatus())) {// là nhân viên thường
+                    if (2 == ContactCustResultDTO.getRecordStatus()) {// là nhân viên thường
                         ContactCustResultDTO.setEnableEdit(true);
-                    } else if ("1".equals(ContactCustResultDTO.getRecordStatus()) && isLower24Hour(ContactCustResultDTO.getCreateTime())) {
+                    } else if (1 == ContactCustResultDTO.getRecordStatus() && isLower24Hour(ContactCustResultDTO.getCreateTime())) {
                         ContactCustResultDTO.setEnableEdit(true);
                     } else {
                         ContactCustResultDTO.setEnableEdit(false);
@@ -439,8 +439,8 @@ public class CampaignExecuteRepositoryImp implements CampaignExecuteRepository {
             logger.error(e.getMessage(), e);
         } finally {
             session.close();
-            return list;
         }
+        return list;
     }
 
     @Override

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

@@ -57,8 +57,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         ResultDTO result = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
-        Session session = sessionFactory.openSession();
-        session.beginTransaction();
+        Session session = null;
 
         if (DataUtil.isNullOrEmpty(requestDto.getCompanySiteId())) {
             result.setErrorCode(Constants.ApiErrorCode.ERROR);
@@ -66,6 +65,9 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             return result;
         }
         try {
+            session = sessionFactory.openSession();
+            session.beginTransaction();
+
             StringBuilder sb = new StringBuilder();
 
             sb.append(" SELECT");
@@ -256,8 +258,10 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             result.setDescription(Constants.ApiErrorDesc.ERROR);
             logger.error(ex.getMessage(), ex);
         } finally {
+            if(null != session) {
                 session.close();
             }
+        }
         return result;
     }
 
@@ -267,8 +271,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         ResultDTO result = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
-        Session session = sessionFactory.openSession();
-        session.beginTransaction();
+        Session session = null;
 
         if (DataUtil.isNullOrEmpty(requestDto.getCompanySiteId())) {
             result.setErrorCode(Constants.ApiErrorCode.ERROR);
@@ -276,6 +279,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             return result;
         }
         try {
+            session = sessionFactory.openSession();
+            session.beginTransaction();
             StringBuilder sb = new StringBuilder();
 //            sb.append(" SELECT CAMPAIGN_ID campaignId, " +
 //                    "       CAMPAIGN_CODE campaignCode, " +
@@ -343,7 +348,7 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             result.setErrorCode(Constants.ApiErrorCode.ERROR);
             result.setDescription(Constants.ApiErrorDesc.ERROR);
         } finally {
-            session.close();
+            if(session != null) session.close();
         }
         return result;
     }
@@ -353,9 +358,10 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
         logger.info("Start search max campaign code index::");
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
-        Session session = sessionFactory.openSession();
-        session.beginTransaction();
+        Session session = null;
         try {
+            session = sessionFactory.openSession();
+            session.beginTransaction();
             //StringBuilder sb = new StringBuilder();
             //sb.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "get-max-campaign-code-index"));
             StringBuilder sb = new StringBuilder();
@@ -373,6 +379,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             }
         } catch (Exception ex) {
             logger.error(ex.getMessage(), ex);
+        }finally {
+            if(session != null) session.close();
         }
         return null;
     }
@@ -779,8 +787,8 @@ public class CampaignRepositoryImpl implements CampaignRepositoryCustom {
             resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
         } finally {
             session.close();
-            return resultDTO;
         }
+        return resultDTO;
     }
 
     @Override

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

@@ -6,6 +6,7 @@ import com.viettel.econtact.filter.UserSession;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
 import java.util.List;
 
 @Service
@@ -17,7 +18,7 @@ public interface CampaignExecuteService {
 
     ResultDTO searchInteractiveResult(CampaignRequestDTO dto);
 
-    XSSFWorkbook exportInteractiveResult(CampaignRequestDTO dto);
+    XSSFWorkbook exportInteractiveResult(CampaignRequestDTO dto) throws IOException;
 
     List<ContactCustResultDTO> getContactCustById(CampaignRequestDTO dto);
     //</editor-fold>

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

@@ -9,6 +9,7 @@ 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 java.io.IOException;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -76,9 +77,9 @@ public interface CustomerService {
 
     List<CustomizeFields> getDynamicHeader(Long companySiteId);
 
-    byte[] buildTemplate(Long companySiteId);
+    byte[] buildTemplate(Long companySiteId) throws IOException;
 
-    Map<String, Object> readAndValidateCustomer(String path, List<CustomizeFields> headerDTOS, UserSession userSession, Long customerListId);
+    Map<String, Object> readAndValidateCustomer(String path, List<CustomizeFields> headerDTOS, UserSession userSession, Long customerListId) throws IOException;
 
     List<CustomizeFieldObject> getCustomizeField(Long customerId);
 

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

@@ -6,6 +6,7 @@ import com.viettel.econtact.filter.UserSession;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -24,7 +25,7 @@ public interface ScenarioService {
 
     ResultDTO saveContacQuestResult(ContactQuestResultDTO dto);
 
-    XSSFWorkbook buildTemplate();
+    XSSFWorkbook buildTemplate() throws IOException;
 
-    Map<String, Object> readAndValidateCustomer(String path, Long scenarioId, Long campaignId, Long companySiteId);
+    Map<String, Object> readAndValidateCustomer(String path, Long scenarioId, Long campaignId, Long companySiteId) throws IOException;
 }

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

@@ -66,8 +66,7 @@ public class AgentsServiceImpl implements AgentsService {
         ResultDTO resultDTO = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
-        Session session = sessionFactory.openSession();
-        session.beginTransaction();
+        Session session = null;
 
         if (DataUtil.isNullOrZero(companySiteId)) {
             resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
@@ -76,6 +75,8 @@ public class AgentsServiceImpl implements AgentsService {
         }
 
         try {
+            session = sessionFactory.openSession();
+            session.beginTransaction();
 //            StringBuilder  sb = new StringBuilder();
 //             sb.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "campaign-agents-by-params"));
 
@@ -136,7 +137,7 @@ public class AgentsServiceImpl implements AgentsService {
             resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
             resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
         } finally {
-            session.close();
+            if(session != null) session.close();
         }
 
         return resultDTO;
@@ -147,8 +148,7 @@ public class AgentsServiceImpl implements AgentsService {
         ResultDTO resultDTO = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
-        Session session = sessionFactory.openSession();
-        session.beginTransaction();
+        Session session = null;
 
         if (DataUtil.isNullOrZero(companySiteId)) {
             resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
@@ -157,6 +157,8 @@ public class AgentsServiceImpl implements AgentsService {
         }
 
         try {
+            session = sessionFactory.openSession();
+            session.beginTransaction();
 //            StringBuilder sb = new StringBuilder();
 //            sb.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "campaign-agents-by-params"));
             StringBuilder sb = new StringBuilder();
@@ -214,7 +216,7 @@ public class AgentsServiceImpl implements AgentsService {
             resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
             resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
         } finally {
-            session.close();
+            if(session != null) session.close();
         }
 
         return resultDTO;
@@ -278,8 +280,7 @@ public class AgentsServiceImpl implements AgentsService {
         ResultDTO resultDTO = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
-        Session session = sessionFactory.openSession();
-        session.beginTransaction();
+        Session session = null;
 
         if (DataUtil.isNullOrZero(companySiteId)) {
             resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
@@ -288,6 +289,8 @@ public class AgentsServiceImpl implements AgentsService {
         }
 
         try {
+            session = sessionFactory.openSession();
+            session.beginTransaction();
 //            StringBuilder sqlStrBuilder = new StringBuilder();
 //            sqlStrBuilder.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "campaign-agents-by-params"));
             StringBuilder sqlStrBuilder = new StringBuilder();
@@ -372,7 +375,7 @@ public class AgentsServiceImpl implements AgentsService {
             resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
             resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
         } finally {
-            session.close();
+            if(session != null) session.close();
         }
 
         return resultDTO;
@@ -383,8 +386,10 @@ public class AgentsServiceImpl implements AgentsService {
         ResultDTO resultDTO = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
-        Session session = sessionFactory.openSession();
-        session.beginTransaction();
+//        Session session = sessionFactory.openSession();
+//        session.beginTransaction();
+
+        Session session = null;
 
         if (DataUtil.isNullOrZero(companySiteId)) {
             resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
@@ -393,6 +398,8 @@ public class AgentsServiceImpl implements AgentsService {
         }
 
         try {
+            session = sessionFactory.openSession();
+            session.beginTransaction();
 //            StringBuilder sb = new StringBuilder();
 //            sb.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_MNG, "campaign-agents-by-params"));
             StringBuilder sb = new StringBuilder();
@@ -477,8 +484,10 @@ public class AgentsServiceImpl implements AgentsService {
             resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
             resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
         } finally {
+            if(null != session){
                 session.close();
             }
+        }
 
         return resultDTO;
     }

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

@@ -44,8 +44,7 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
         ResultDTO resultDTO = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
-        Session session = sessionFactory.openSession();
-        session.beginTransaction();
+        Session session = null;
 
         if (DataUtil.isNullOrZero(companySiteId)) {
             resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
@@ -54,6 +53,8 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
         }
 
         try {
+            session = sessionFactory.openSession();
+            session.beginTransaction();
 //            StringBuilder sqlStrBuilder = new StringBuilder();
 //            sqlStrBuilder.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_STATUS_MNG, "findAll-CampaignCompleteCode"));
             StringBuilder sb = new StringBuilder();
@@ -132,7 +133,7 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
             resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
             logger.error(e.getMessage(), e);
         } finally {
-            session.close();
+            if(session != null) session.close();
         }
 
         return resultDTO;
@@ -278,8 +279,7 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
         ResultDTO resultDTO = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
-        Session session = sessionFactory.openSession();
-        session.beginTransaction();
+        Session session = null;
 
         if (DataUtil.isNullOrZero(completeCodeDTO.getCompanySiteId())) {
             resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
@@ -288,6 +288,8 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
         }
 
         try {
+            session = sessionFactory.openSession();
+            session.beginTransaction();
 //            StringBuilder sqlStrBuilder = new StringBuilder();
 //            sqlStrBuilder.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_STATUS_MNG, "get-max-value-completevalue"));
             StringBuilder sb = new StringBuilder();
@@ -323,9 +325,9 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
             resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
             logger.error(e.getMessage(), e);
         } finally {
-            session.close();
-            return resultDTO;
+            if(session != null) session.close();
         }
+        return resultDTO;
     }
 
     @Override
@@ -367,8 +369,7 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
         ResultDTO resultDTO = new ResultDTO();
         SessionFactory sessionFactory = HibernateUtil.getSessionFactory();
 
-        Session session = sessionFactory.openSession();
-        session.beginTransaction();
+        Session session = null;
 
         if (DataUtil.isNullOrZero(campaignCompleteCodeId)) {
             resultDTO.setErrorCode(Constants.ApiErrorCode.ERROR);
@@ -377,6 +378,8 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
         }
 
         try {
+            session = sessionFactory.openSession();
+            session.beginTransaction();
 //            StringBuilder sqlStrBuilder = new StringBuilder();
 //            sqlStrBuilder.append(SQLBuilder.getSqlQueryById(SQLBuilder.SQL_MODULE_CAMPAIGN_STATUS_MNG,"findCampaignCodeById"));
 
@@ -437,7 +440,7 @@ public class CampaignCfgServiceImpl implements CampaignCfgService {
             resultDTO.setDescription(Constants.ApiErrorDesc.ERROR);
             logger.error(e.getMessage(), e);
         } finally {
-            session.close();
+            if(session != null) session.close();
         }
 
         return resultDTO;

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

@@ -24,6 +24,9 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -33,6 +36,8 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     private static final Logger logger = LoggerFactory.getLogger(CampaignExecuteServiceImp.class);
     private SimpleDateFormat formatter = new SimpleDateFormat(Constants.DATE_FORMAT.FOMART_DATE_TYPE_1);
 
+    private Random rand = SecureRandom.getInstanceStrong();
+
     @Autowired
     ModelMapper modelMapper;
 
@@ -66,6 +71,9 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     @Autowired
     CampaignCustomerListColumnRepository campaignCustomerListColumnRepository;
 
+    public CampaignExecuteServiceImp() throws NoSuchAlgorithmException {
+    }
+
     //<editor-fold: hungtt>
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
@@ -119,14 +127,15 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
 
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public XSSFWorkbook exportInteractiveResult(CampaignRequestDTO dto) {
+    public XSSFWorkbook exportInteractiveResult(CampaignRequestDTO dto) throws IOException {
         Locale locale = Locale.forLanguageTag("vi");
         List<ContactCustResultDTO> list = campaignExecuteRepository.getExcelInteractiveResult(dto);
 
-        XSSFWorkbook workbook = new XSSFWorkbook();
+        XSSFWorkbook workbook = null;
         Sheet sheet;
-
+        try {
             // create font style
+            workbook = new XSSFWorkbook();
             Font defaultFont = workbook.createFont();
             defaultFont.setFontHeightInPoints((short) 13);
             defaultFont.setFontName("Times New Roman");
@@ -217,6 +226,12 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
                 ++rowIndex;
                 ++count;
             }
+        }catch (Exception e){
+
+        }finally {
+            if (workbook != null) workbook.close();
+        }
+
         return workbook;
     }
 
@@ -493,13 +508,13 @@ public class CampaignExecuteServiceImp implements CampaignExecuteService {
     @Override
     public ResultDTO getCallStatus(CampaignRequestDTO dto) {
         ResultDTO result = new ResultDTO();
-        Random r = new Random();
+//        Random r = new Random();
         String[] arr = {"ACCEPT", "REJECT", "MISSING"};
 
         if (dto != null) {
             result.setErrorCode(Constants.ApiErrorCode.SUCCESS);
             result.setDescription(Constants.ApiErrorDesc.SUCCESS);
-            result.setData(arr[r.nextInt(arr.length)]);
+            result.setData(arr[this.rand.nextInt(arr.length)]);
         } else {
             result.setErrorCode(Constants.ApiErrorCode.ERROR);
             result.setDescription(Constants.ApiErrorDesc.ERROR);

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

@@ -596,7 +596,7 @@ public class CampaignServiceImpl implements CampaignService {
             // Cap nhat cac truong da co san
             for (FieldsToShowDTO fieldsToShowDTO : list) {
                 if (fieldsToShowDTO.getId() != null) {
-                    listColumns.removeIf(p -> p.getCampaignCusListColId() == fieldsToShowDTO.getId());
+                    listColumns.removeIf(p -> p.getCampaignCusListColId().equals(fieldsToShowDTO.getId()));
                     CampaignCustomerListColumn entity = campaignCustomerListColumnRepository.findByCampaignCusListColId(fieldsToShowDTO.getId());
                     entity.setOrderIndex((long) (list.indexOf(fieldsToShowDTO) + 1));
                     campaignCustomerListColumnRepository.save(entity);

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

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.*;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -161,12 +162,13 @@ public class ScenarioServiceImpl implements ScenarioService {
 
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public XSSFWorkbook buildTemplate() {
+    public XSSFWorkbook buildTemplate() throws IOException {
         Locale locale = new Locale("vi", "VN");
+        XSSFWorkbook workbook = null;
         try {
-            XSSFWorkbook workbook = new XSSFWorkbook();
-            Sheet sheet;
 
+            Sheet sheet;
+            workbook = new XSSFWorkbook();
             CellStyle styleTitle = WorkBookBuilder.buildDefaultStyleTitle(workbook);
             CellStyle styleRowHeader = WorkBookBuilder.buildDefaultStyleRowHeader(workbook);
             CellStyle styleRow = WorkBookBuilder.buildDefaultStyleRow(workbook);
@@ -237,17 +239,20 @@ public class ScenarioServiceImpl implements ScenarioService {
         } catch (Exception e) {
             logger.error(e.getMessage());
             return null;
+        }finally {
+            if (workbook != null) workbook.close();
         }
     }
 
     @Override
     @Transactional(DataSourceQualify.CCMS_FULL)
-    public Map<String, Object> readAndValidateCustomer(String path, Long scenarioId, Long campaignId, Long companySiteId) {
+    public Map<String, Object> readAndValidateCustomer (String path, Long scenarioId, Long campaignId, Long companySiteId) throws IOException{
         Locale locale = new Locale("vi", "VN");
         SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
         Map<String, Object> result = new HashMap<>();
         StringBuilder sb = new StringBuilder();
         boolean isValid = true;
+        XSSFWorkbook workbook = null;
         try {
             List<String> fileHeaderList = new ArrayList<>();
             fileHeaderList.add(BundleUtils.getLangString("scenario.template.questionCode", locale));
@@ -261,7 +266,8 @@ public class ScenarioServiceImpl implements ScenarioService {
 
             File file = new File(path);
             FileInputStream fis = new FileInputStream(file);
-            XSSFWorkbook workbook = new XSSFWorkbook(fis);
+            workbook = new XSSFWorkbook(fis);
+            workbook = new XSSFWorkbook(fis);
             ByteArrayOutputStream os = new ByteArrayOutputStream();
             Sheet sheet = workbook.getSheetAt(0);
             Row row = sheet.getRow(2);
@@ -404,9 +410,26 @@ public class ScenarioServiceImpl implements ScenarioService {
             //insert data
             if (isValid) {
                 List<ScenarioQuestionDTO> lstQuestion = buildQuestionsLst(rawDataList, scenarioId, campaignId, companySiteId);
+                List<ScenarioAnswerDTO> lstAnswerTmp = new ArrayList<>();
                 lstQuestion.forEach(question -> {
+                    lstAnswerTmp.addAll(question.getLstAnswers());
                     questionService.add(question);
                 });
+
+                //for import mapping question from xls: update mapping question id for answer
+//                lstAnswerTmp.forEach(item -> {
+//                    if (item.getMappingQuestionCode() != null && item.getMappingQuestionId() == null) {
+//                        ScenarioQuestion question = questionRepository.findScenarioQuestionByCodeAndCompanySiteId(item.getMappingQuestionCode(), item.getCompanySiteId());
+//                        if (question != null) {
+//                            ScenarioAnswer answerForUpdate = answerRepository.findScenarioAnswerByScenarioQuestionIdAndCode(question.getScenarioQuestionId(), item.code);
+//                            if(answerForUpdate != null) {
+//                                answerForUpdate.setMappingQuestionId(question.getScenarioQuestionId());
+//                                answerRepository.save(answerForUpdate);
+//                            }
+//                        }
+//                    }
+//                });
+
                 workbook.write(os);
                 os.flush();
                 os.close();
@@ -423,21 +446,24 @@ public class ScenarioServiceImpl implements ScenarioService {
             }
         } catch (Exception ex) {
             logger.info(ex.getMessage(), ex);
+            result.put("message", BundleUtils.getLangString("customer.errorValidate", locale));
+        }finally {
+            if (workbook != null) workbook.close();
             result.put("code", Constants.FILE_UPLOAD_RESP_CODE.ERROR);
         }
         return result;
     }
 
     private boolean validateMappingQuestion(String mappingQuestion, String currentQuestionCode, List<String> lstQuestionCode) {
-        if (mappingQuestion == currentQuestionCode) return false;
+        if (mappingQuestion != null && mappingQuestion.equals(currentQuestionCode)) return false;
 
         String duplicateCode = lstQuestionCode.stream().
                 filter(p -> (p.equals(mappingQuestion) && p.equals(currentQuestionCode))).
                 findAny().orElse(null);
         if (duplicateCode == null) return false;
 
-//        String notMappedCode = lstQuestionCode.stream().filter(p -> (!p.equals(mappingQuestion))).findAny().orElse(null);
-//        if(notMappedCode != null) return false;
+        String notMappedCode = lstQuestionCode.stream().filter(p -> (!p.equals(mappingQuestion))).findAny().orElse(null);
+        if (notMappedCode != null) return false;
         return true;
     }
 
@@ -508,6 +534,17 @@ public class ScenarioServiceImpl implements ScenarioService {
             });
             q.setLstAnswers(answers);
         });
+
+        lstQuestions.forEach(q2 -> {
+            List<ScenarioAnswerDTO> lstAnswers = q2.getLstAnswers();
+            lstAnswers.forEach(a2 -> {
+                ScenarioQuestionDTO mappingQuestion = lstQuestions.stream().filter(mq -> mq.getImportCode().equals(a2.getMappingQuestionCode())).findFirst().orElse(null);
+                if (mappingQuestion != null) {
+                    a2.setMappingQuestionCode(mappingQuestion.getCode());
+                }
+            });
+        });
+
         questionOrderIndex = null;
         return lstQuestions;
     }

src/main/java/com/viettel/campaign/utils/BundleUtils.java

@@ -12,7 +12,7 @@ import java.util.ResourceBundle;
  */
 public class BundleUtils {
     protected static final Logger logger = LoggerFactory.getLogger(BundleUtils.class);
-    private static volatile ResourceBundle rsConfig = null;
+    private static ResourceBundle rsConfig = null;
     private static final String GLOBAL_CONFIG = "config/globalConfig";
 
     public static String getLangString(String key, Locale... locale) {

src/main/java/com/viettel/campaign/utils/DataUtil.java

@@ -127,17 +127,10 @@ public class DataUtil {
     }
 
     public static boolean safeEqual(Long obj1, Long obj2) {
-        if (obj1 == obj2) {
+        if (obj1.equals(obj2)) {
             return true;
         }
-        return ((obj1 != null) && (obj2 != null) && (obj1.compareTo(obj2) == 0));
-    }
-
-    public static boolean safeEqual(String obj1, String obj2) {
-        if (obj1 == obj2) {
-            return true;
-        }
-        return ((obj1 != null) && (obj2 != null) && obj1.equals(obj2));
+        return obj2 != null && obj1.compareTo(obj2) == 0;
     }
 
     public static String convertDateToStringDDMMYYYYHHMISS(Date datetime) {

src/main/java/com/viettel/campaign/utils/RedisUtil.java

@@ -16,7 +16,8 @@ public class RedisUtil {
 
     private static final Logger logger = Logger.getLogger(RedisUtil.class);
 
-    private static volatile RedisUtil INSTANCE = null;
+//    private static volatile RedisUtil INSTANCE = null;
+    private static RedisUtil INSTANCE = null;
     private JedisCluster jedisCluster;
     private String redisAddress;
     private int redisTimeout;

src/main/java/com/viettel/campaign/utils/WorkBookBuilder.java

@@ -4,7 +4,7 @@ import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 /**
- * @author anhvd_itsol
+ * @author anhvd_itsol  0ad5d5fb7aa141b4ac383bcb096e2ec3faba0b1b
  */
 public class WorkBookBuilder {
     public static Font buildDefaultFont(XSSFWorkbook workbook) {

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

@@ -6,6 +6,7 @@ import lombok.Setter;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author anhvd_itsol

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

@@ -30,7 +30,10 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 @Controller
 @RequestMapping("/ipcc/customer")
@@ -194,7 +197,6 @@ public class CustomerController {
                                         @RequestPart("customerListId") String customerListId,
                                         HttpServletRequest request) {
         LOGGER.info("------------IMPORT FILE TEMPLATE--------------");
-        Locale locale = new Locale("vi", "VN");
         try {
             UserSession userSession = (UserSession) RedisUtil.getInstance().get(request.getHeader("X-Auth-Token"));
             if (file.isEmpty()) {