anhvd commit scenario import

pom.xml

@@ -49,8 +49,8 @@
         <dependency>
             <groupId>com.oracle</groupId>
             <artifactId>ojdbc7</artifactId>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/ojdbc7.jar</systemPath>
+<!--            <scope>system</scope>-->
+<!--            <systemPath>${project.basedir}/lib/ojdbc7.jar</systemPath>-->
             <version>1.0</version>
         </dependency>
         <dependency>

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

@@ -309,18 +309,6 @@ public class ScenarioServiceImpl implements ScenarioService {
                                     obj[j] = dataCell.getStringCellValue();
                                     break;
                             }
-                        } else {
-                            Cell headerCell = row.getCell(j);
-//                            if (headerCell.getStringCellValue().equals(BundleUtils.getLangString("scenario.template.questionType", locale))) {
-//                                obj[j] = BundleUtils.getLangString("customer.cusType.normal", locale);
-//                            } else if (headerCell.getStringCellValue().equals(BundleUtils.getLangString("customer.callAllowed", locale)) ||
-//                                    headerCell.getStringCellValue().equals(BundleUtils.getLangString("customer.emailAllowed", locale)) ||
-//                                    headerCell.getStringCellValue().equals(BundleUtils.getLangString("customer.smsAllowed", locale))) {
-//                                obj[j] = BundleUtils.getLangString("customer.yes", locale);
-//                                break;
-//                            } else {
-//                                obj[j] = null;
-//                            }
                         }
                     }
                     rawDataList.add(obj);
@@ -331,14 +319,14 @@ public class ScenarioServiceImpl implements ScenarioService {
             String selectedType = "";
             for (int i = 0; i < rawDataList.size(); i++) {
                 if (rawDataList.get(i)[0] != null && !rawDataList.get(i)[0].toString().trim().equals(""))
-                    selectedType = rawDataList.get(i)[0].toString().trim();
+                    selectedType = rawDataList.get(i)[1].toString().trim();
                 //validate question
                 if ((rawDataList.get(i)[0] != null && !rawDataList.get(i)[0].toString().trim().equals("")) ||
                         (rawDataList.get(i)[1] != null && !rawDataList.get(i)[1].toString().trim().equals("")) ||
                         (rawDataList.get(i)[2] != null && !rawDataList.get(i)[2].toString().trim().equals("")) ||
                         (rawDataList.get(i)[5] != null && !rawDataList.get(i)[5].toString().trim().equals("")) ||
                         (rawDataList.get(i)[6] != null && !rawDataList.get(i)[6].toString().trim().equals(""))) {
-                    if (rawDataList.get(i)[0] == null || !DataUtil.isLong(rawDataList.get(i)[0].toString())) {
+                    if (rawDataList.get(i)[0] == null || !DataUtil.isNumber(rawDataList.get(i)[0].toString())) {
                         sb.append(BundleUtils.getLangString("scenario.questionCode.required"));
                     }
                     if (rawDataList.get(i)[1] == null || rawDataList.get(i)[1].toString().trim().equals("")) {
@@ -359,7 +347,7 @@ public class ScenarioServiceImpl implements ScenarioService {
                 if ((rawDataList.get(i)[3] != null && !rawDataList.get(i)[3].toString().trim().equals("")) ||
                         (rawDataList.get(i)[4] != null && !rawDataList.get(i)[4].toString().trim().equals("")) ||
                         (rawDataList.get(i)[7] != null && !rawDataList.get(i)[7].toString().trim().equals(""))) {
-                    if ((rawDataList.get(i)[3] == null || !DataUtil.isLong(rawDataList.get(i)[3].toString())) && (!selectedType.equals(BundleUtils.getLangString("scenario.template.text")))) {
+                    if ((rawDataList.get(i)[3] == null || rawDataList.get(i)[3].toString().trim().equals("")) && (!selectedType.equals(BundleUtils.getLangString("scenario.template.text")))) {
                         sb.append(BundleUtils.getLangString("scenario.answer.required"));
                     }
                     if(rawDataList.get(i)[4] == null && rawDataList.get(i)[4].toString().trim().equals("")) {
@@ -382,8 +370,9 @@ public class ScenarioServiceImpl implements ScenarioService {
 
             //insert data
             if (isValid) {
+                logger.info("----- Data valid, start import scenario question -----");
                 for (int i = 0; i < rawDataList.size(); i++) {
-
+                    buildQuestionsLst(rawDataList);
                 }
             }else {
                 FileOutputStream fos = new FileOutputStream(file);
@@ -395,6 +384,7 @@ public class ScenarioServiceImpl implements ScenarioService {
             logger.info(ex.getMessage(), ex);
             result.put("message", BundleUtils.getLangString("customer.errorValidate", locale));
         }
+        logger.info("Import Questions result:" , result);
         return result;
     }
 
@@ -402,4 +392,16 @@ public class ScenarioServiceImpl implements ScenarioService {
         if (index != null && DataUtil.isLong(index.toString())) return true;
         return false;
     }
+
+    private List<ScenarioQuestionDTO> buildQuestionsLst(List<Object[]> rawDatas) {
+        List<ScenarioQuestionDTO> lstQuestions = new ArrayList<>();
+        ScenarioQuestionDTO questionDTO = null;
+        for(int i = 0; i < rawDatas.size(); i++) {
+            if(rawDatas.get(i)[0] != null && !rawDatas.get(i)[0].toString().trim().equals("")) {
+                questionDTO = new ScenarioQuestionDTO();
+//                questionDTO.setCampaignId();
+            }
+        }
+        return lstQuestions;
+    }
 }

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

@@ -122,7 +122,7 @@ public class ScenarioController {
             String message = (String) map.get("message");
             return ResponseEntity.ok()
                     .header("Content-Type", Constants.MIME_TYPE.EXCEL_XLSX)
-                    .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=template_import_customer.xlsx")
+                    .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=import_scenario_result.xlsx")
                     .header("Message", message)
                     .body(Files.readAllBytes(fileExport.toPath()));
         } catch (Exception e) {