优化excel提交界面，修复部分bug

src/main/java/com/mooctest/controller/PaperController.java

@@ -1,5 +1,7 @@
 package com.mooctest.controller;
 
+import antlr.PrintWriterWithSMAP;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.mooctest.service.AuditTaskService;
@@ -9,12 +11,19 @@ import com.mooctest.service.PaperService;
 import org.apache.poi.hssf.record.DVALRecord;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpRequest;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.sql.Timestamp;
+import java.util.HashMap;
+import java.util.Map;
 
 @Controller
 public class PaperController {
@@ -49,13 +58,16 @@ public class PaperController {
         return "add_excel_pro";
     }
 
-    @PostMapping("/excelToMongo")
-    public String excelToMongo (@RequestParam("name")String name, @RequestParam("excelFile") MultipartFile multipartFile){
+
+    @PostMapping("/add_excel_pro")
+    @ResponseBody
+    public  String excelToMongo (HttpServletResponse response, @RequestParam("name")String name, @RequestParam("excelFile") MultipartFile multipartFile) throws IOException {
         // 从前端接收Excel文件，并返回文件保存的全路径
         String fileFullPath = excelInputService.saveMultipartFile(multipartFile, name);
         // 拿取文件，并将文件内容插入到Mongo数据库中
-        excelInputService.excelToMongo(fileFullPath, name);
-        return "add_excel_ok";
+        Map<String, Boolean> is_success = excelInputService.excelToMongo(fileFullPath, name);
+        String  insert_success_json= JSON.toJSONString(is_success);
+        return insert_success_json;
     }
 
 

src/main/java/com/mooctest/data/BugDTO.java

@@ -39,4 +39,5 @@ public class BugDTO{
     private String masterId;
     private String treeId;
     private String bug_page;
+    private String title;
 }

src/main/java/com/mooctest/service/ExcelInputService.java

@@ -32,10 +32,12 @@ public class ExcelInputService {
         InputStream inputStream = null;
         String fileName = fileSaveName;
         String fileFullPath = null;
+        String fileType =null;
 
         try {
             inputStream = file.getInputStream();
             fileName = file.getOriginalFilename();
+
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -78,14 +80,16 @@ public class ExcelInputService {
 
 
     // 解析File文件，并将为数据库表中各字段赋值，并将数据数据插入数据库中
-    public void excelToMongo(String address, String fileSaveName) {
+    public Map<String, Boolean> excelToMongo(String address, String fileSaveName) {
         Integer orderId=UUID.randomUUID().toString().hashCode();
         orderId = orderId < 0 ? -orderId : orderId;
         Long task_id = Long.valueOf(orderId);
         Long case_id = task_id;
         String task_name = fileSaveName;
+        List<String> fieldList = null;
         Task task = new Task(task_id, case_id, task_name);
         taskDao.save(task);
+        Map<String, Boolean> insert_map = new HashMap<>();
 
         try {
             // 输入文件
@@ -98,12 +102,19 @@ public class ExcelInputService {
                 e.printStackTrace();
             }
 
-            List<Document> documents = new ArrayList<Document>();
-            List<String> fieldList = new ArrayList<String>();
+            fieldList = new ArrayList<String>();
             // 获取Excel文档中第一个表单
             Sheet sheet = workbook.getSheetAt(0);
             // 获取表单第一行作为表头
             Row topRow = sheet.getRow(0);
+            if (topRow == null) {
+                insert_map.put("file_is_null", true);
+                insert_map.put("insert_success", false);
+                return insert_map;
+            } else {
+                insert_map.put("file_is_null", false);
+
+            }
             for (Cell cell : topRow) {
                 fieldList.add(cell.toString());
             }
@@ -111,6 +122,7 @@ public class ExcelInputService {
             System.out.println("文件列表" + fieldList);
             // 获得表单的行数
             int rows = sheet.getLastRowNum() + 1;
+
             // 获得每行的列数
             int colunms = fieldList.size();
             // 从第二行开始遍历表格
@@ -119,6 +131,11 @@ public class ExcelInputService {
                 Row row = sheet.getRow(i);
                 String exam_case_id = task_id+"-"+ case_id;
                 long create_time_millis = System.currentTimeMillis();
+                extendBug.setBugCategory("空");
+                extendBug.setSeverity((short) 0);
+                extendBug.setRecurrent((short) 0);
+                extendBug.setTitle("空");
+                extendBug.setDescription("空");
                 extendBug.setExamId(task_id+"");
                 extendBug.setCaseId(case_id+"");
                 extendBug.setExamCaseId(exam_case_id);
@@ -129,22 +146,49 @@ public class ExcelInputService {
                  */
                 for (int j = 0; j < colunms; j++) {
                     Cell cell = row.getCell(j);
-                    if(j == 0){
-                        String title = cell.toString();
+                    String topName = fieldList.get(j);
+                    if(topName.equals("title") || topName.equals("题目")){
+                        String title;
+                        if(cell == null || cell.toString().equals("")){
+                            title = "null";
+                        }else{
+                            title = cell.toString();
+                        }
                         extendBug.setTitle(title);
-                    }else if(j == 1){
-                        String bug_category = cell.toString();
+                    }else if(topName.equals("bug_category") || topName.equals("分类")){
+                        String bug_category;
+                        if(cell == null || cell.toString().equals("")){
+                            bug_category = "null";
+                        }else{
+                            bug_category = cell.toString();
+                        }
                         extendBug.setBugCategory(bug_category);
-                    }else if(j == 2){
-                        int num = new Double(Double.parseDouble(cell.toString())).intValue();
+                    }else if(topName.equals("severity") || topName.equals("严重等级")){
+                        int num;
+                        if(cell == null || cell.toString().equals("")){
+                            num = 0;
+                        }else{
+                            num = new Double(Double.parseDouble(cell.toString())).intValue();
+                        }
                         short severity = (short)num;
                         extendBug.setSeverity(severity);
-                    }else if(j == 3){
-                        int num = new Double(Double.parseDouble(cell.toString())).intValue();
+                    }else if(topName.equals("recurrent") || topName.equals("复现程度")){
+                        int num;
+                        if(cell == null || cell.toString().equals("")){
+                            num = 0;
+                        }else{
+                            num = new Double(Double.parseDouble(cell.toString())).intValue();
+                        }
                         short recurrent = (short)num;
                         extendBug.setRecurrent(recurrent);
                     }else{
-                        String description = cell.toString();
+                        String description;
+                        if(cell == null || cell.toString().equals("")){
+                            description = "null";
+                        }else{
+                            description = cell.toString();
+                        }
+
                         extendBug.setDescription(description);
                     }
 
@@ -156,8 +200,12 @@ public class ExcelInputService {
             // 导入成功后将本地文件夹删除
             File file = new File(address);
             file.delete();
+            insert_map.put("insert_success", true);
+            return insert_map;
         } catch (FileNotFoundException e) {
             System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            insert_map.put("insert_success", false);
+            return insert_map;
         }
     }
 }

src/main/java/com/mooctest/util/ReportUtil.java

@@ -10,6 +10,7 @@ public class ReportUtil {
             put((short)3, "一般");
             put((short)2, "较轻");
             put((short)1, "待定");
+            put((short)0, "空");
     }};
 
     public static Map<Integer, String> category2String = new HashMap<Integer, String>() {{
@@ -20,6 +21,8 @@ public class ReportUtil {
         put(1, "安全");
         put(6, "不正常退出");
         put(7, "其他");
+        put(0, "空");
+
     }};
 
     public static Map<String, Integer> string2Category = new HashMap<String, Integer>() {{
@@ -30,6 +33,7 @@ public class ReportUtil {
         put("安全", 1);
         put("不正常退出", 6);
         put("其他", 7);
+        put("空", 0);
     }};
 
     public static Map<Short, String> recurrent2String = new HashMap<Short, String>() {{
@@ -38,6 +42,8 @@ public class ReportUtil {
         put((short)3, "小概率复现");
         put((short)2, "无规律复现");
         put((short)1, "其他");
+        put((short)0, "空");
+
     }};
 
     public static Map<Long, String> reviewerMap = new HashMap<Long, String>() {{

src/main/resources/templates/add_excel_pro.html

@@ -147,24 +147,25 @@
                </div>
 
                 <div class="box-body">
-                    <form action="/excelToMongo" class="form-horizontal"  method="post" enctype="multipart/form-data">
+                    <form id="form" action="/excelToMongo" class="form-horizontal"  method="post" enctype="multipart/form-data">
                         <!-- text input -->
                         <div class="form-group">
                             <label class="col-sm-2 control-label">名称</label>
                             <div class="col-sm-10">
-                                <input type="text" class="form-control" name="name" />
+                                <input type="text" class="form-control" id="name" name="name" onblur="checkName()" />
+                                <span name="name_span" style="color: #ff0000"></span>
                             </div>
                         </div>
-
-
                         <div class="form-group">
                             <label   class="col-sm-2 control-label">导入Bug文件</label>
                             <div class="col-sm-10">
-                                <input  type="file"  name="excelFile"/>
+                                <a  href="http://crowdtest-data.oss-cn-hangzhou.aliyuncs.com/%E6%A8%A1%E6%9D%BF%E6%96%87%E4%BB%B6.xls">文件模板</a>
+                                <input  type="file"  id="excel_file" name="excelFile" onchange="checkFile()" />
+                                <span name="file_span" style="color: #ff0000"></span>
                             </div>
                         </div>
-                        <input class="btn btn-success pull-right" type="submit" value="提交">
-
+                        <span id="submit_span"></span>
+                        <input class="btn btn-success pull-right" type="button" value="提交" id="submit_file" onmousemove="checkSubmit()" onclick="check_success()">
                     </form>
                 </div>
             </div>
@@ -196,11 +197,8 @@
                     <!--                    <button type="button" class="btn btn-primary"></button>-->
                 </div>
             </div>
-            <!-- /.modal-content -->
         </div>
-        <!-- /.modal-dialog -->
     </div>
-    <!-- /.modal -->
 
     <div class="modal fade" id="modal-alert">
         <div class="modal-dialog">
@@ -218,14 +216,10 @@
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default pull-left" data-dismiss="modal">关闭</button>
-                    <!--                    <button type="button" class="btn btn-primary"></button>-->
                 </div>
             </div>
-            <!-- /.modal-content -->
         </div>
-        <!-- /.modal-dialog -->
     </div>
-    <!-- /.modal -->
 
 
 
@@ -253,19 +247,14 @@
                     <button type="button" class="btn btn-primary" onclick="reloadJob()">确认</button>
                 </div>
             </div>
-            <!-- /.modal-content -->
         </div>
-        <!-- /.modal-dialog -->
     </div>
-    <!-- /.modal -->
 </div>
 
 
 </body>
 </html>
-<!-- jQuery 3 -->
-<!--<script src="/static/AdminLTE/bower_components/jquery/dist/jquery.min.js"></script>-->
-<!-- Bootstrap 3.3.7 -->
+
 <script src="/static/AdminLTE/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
 <script src="/static/AdminLTE/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
 <script src="/static/AdminLTE/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
@@ -297,11 +286,17 @@
 <script type="text/javascript" src="http://www.jq22.com/demo/clipboard.js-master201703170013/dist/clipboard.min.js"></script>
 
 <script  type="text/javascript" xmlns:th="http://www.thymeleaf.org" th:inline="javascript">
+
+
     var ruleId ;
     var ratioIndex;
     /*<![CDATA[*/
     var reportHost = [[${reportHost}]]
     /*]]>*/
+
+    var name_flag = false;
+    var file_flag = false;
+
     $(document).ready(function(){
         $('[data-toggle="tooltip"]').tooltip();
         //Initialize Select2 Elements
@@ -314,4 +309,108 @@
         });
     });
 
+
+
+
+
+    function checkFile() {
+        var fileName = document.getElementsByName("excelFile")[0].value;
+        console.info(fileName)
+        var index = fileName.lastIndexOf(".");
+        var file_type = fileName.substr(index+1);
+        var file_span = document.getElementsByName("file_span")[0];
+
+        var file = document.getElementById("excel_file").files[0];
+        var file_size=file.size;//文件的字节数
+
+
+        if(file_type != "xls" && file_type != "xlsx"){
+            file_span.innerText="文件类型错误，请导入excel文件";
+            file_flag = false;
+        }else {
+            file_span.innerText="";
+            if(file_size > 1048576){
+                file_span.innerText="文件大小超过1M，请上传小于1M文件";
+                file_flag = false;
+            }else {
+                file_span.innerText="";
+                file_flag = true;
+            }
+        }
+
+        checkSubmit();
+    }
+
+    function checkSubmit() {
+        var submit_button = document.getElementById("submit_file");
+        if(name_flag && file_flag){
+            submit_button.removeAttribute("disabled");
+        }else{
+            submit_button.setAttribute("disabled", true);
+        }
+
+    }
+
+    function checkName() {
+        var name = document.getElementsByName("name")[0].value;
+        var name_span = document.getElementsByName("name_span")[0];
+        if(name == null || name == "" || name.trim().length == 0){
+            name_span.innerText= "输入字段不能为空";
+            name_flag = false;
+        }else{
+            name_span.innerText= "";
+            name_flag = true;
+        }
+        checkSubmit();
+    }
+
+    function check_success(){
+        var params = new FormData();
+        params.append("name",$("#name").val())
+        params.append("excelFile",document.getElementById('excel_file').files[0])
+        $.ajax({
+            type:"post",
+            url:"/add_excel_pro",
+            processData: false,
+            contentType: false,
+            data:params,
+            dataType:'json',
+            success:function(result){
+                console.info(result);
+                if(result["file_is_null"] == false && result["insert_success"] == true){
+                    $.notify({
+                        message: '导入成功'
+                    },{
+                        // settings
+                        delay: 100,
+                        timer: 1000,
+                        type: 'success'
+                    });
+                }else{
+                    $.notify({
+                        message: '导入失败,请按文件模板样式导入文件'
+                    },{
+                        // settings
+                        delay: 100,
+                        timer: 1000,
+                        type: 'danger'
+                    });
+                }
+
+
+            },
+            error:function(data){
+                $.notify({
+                    message: '网络错误'
+                },{
+                    // settings
+                    delay: 100,
+                    timer: 1000,
+                    type: 'warning'
+                });
+            }
+        })
+    }
+
+
 </script>

src/main/resources/templates/agg_report_new.html

@@ -296,17 +296,26 @@
                             <div class="form-group">
                                 <label>Bug 复现程度</label>
                                 <select id="recurrent" name="recurrent" class="form-control">
-                                    <option th:each="mapItem : ${recurrent2String}"
-                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>
-
+<!--                                    <option th:each="mapItem : ${recurrent2String}"-->
+<!--                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>-->
+                                    <option value="1">其他</option>
+                                    <option value="2">无规律复现</option>
+                                    <option value="3">小概率复现</option>
+                                    <option value="4">大概率复现</option>
+                                    <option value="5">必现</option>
                                 </select>
                             </div>
                             <!-- select -->
                             <div class="form-group">
                                 <label>Bug 严重性</label>
                                 <select id="severity" name="severity" class="form-control">
-                                    <option th:each="mapItem : ${severity2String}"
-                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>
+<!--                                    <option th:each="mapItem : ${severity2String}"-->
+<!--                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>-->
+                                    <option value="1">待定</option>
+                                    <option value="2">较轻</option>
+                                    <option value="3">一般</option>
+                                    <option value="4">严重</option>
+                                    <option value="5">紧急</option>
                                 </select>
                             </div>
 
@@ -314,8 +323,15 @@
                             <div class="form-group">
                                 <label>Bug 分类</label>
                                 <select id="category" class="form-control">
-                                    <option th:each="mapItem : ${category2String}"
-                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>
+<!--                                    <option th:each="mapItem : ${category2String}"-->
+<!--                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>-->
+                                    <option value="1">安全</option>
+                                    <option value="2">功能不完整</option>
+                                    <option value="3">性能</option>
+                                    <option value="4">页面布局缺陷</option>
+                                    <option value="5">用户体验</option>
+                                    <option value="6">不正常退出</option>
+                                    <option value="7">其他</option>
                                 </select>
                             </div>
 

src/main/resources/templates/aggr_report.html

@@ -226,17 +226,26 @@
                             <div class="form-group">
                                 <label>Bug 复现程度</label>
                                 <select id="recurrent" name="recurrent" class="form-control">
-                                    <option th:each="mapItem : ${recurrent2String}"
-                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>
-
+<!--                                    <option th:each="mapItem : ${recurrent2String}"-->
+<!--                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>-->
+                                    <option value="1">其他</option>
+                                    <option value="2">无规律复现</option>
+                                    <option value="3">小概率复现</option>
+                                    <option value="4">大概率复现</option>
+                                    <option value="5">必现</option>
                                 </select>
                             </div>
                             <!-- select -->
                             <div class="form-group">
                                 <label>Bug 严重性</label>
                                 <select id="severity" name="severity" class="form-control">
-                                    <option th:each="mapItem : ${severity2String}"
-                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>
+<!--                                    <option th:each="mapItem : ${severity2String}"-->
+<!--                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>-->
+                                    <option value="1">待定</option>
+                                    <option value="2">较轻</option>
+                                    <option value="3">一般</option>
+                                    <option value="4">严重</option>
+                                    <option value="5">紧急</option>
                                 </select>
                             </div>
 
@@ -244,8 +253,15 @@
                             <div class="form-group">
                                 <label>Bug 分类</label>
                                 <select id="category" class="form-control">
-                                    <option th:each="mapItem : ${category2String}"
-                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>
+<!--                                    <option th:each="mapItem : ${category2String}"-->
+<!--                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>-->
+                                    <option value="1">安全</option>
+                                    <option value="2">功能不完整</option>
+                                    <option value="3">性能</option>
+                                    <option value="4">页面布局缺陷</option>
+                                    <option value="5">用户体验</option>
+                                    <option value="6">不正常退出</option>
+                                    <option value="7">其他</option>
                                 </select>
                             </div>
 

src/main/resources/templates/single_report.html

@@ -219,17 +219,26 @@
                             <div class="form-group">
                                 <label>Bug 复现程度</label>
                                 <select id="recurrent" name="recurrent" class="form-control">
-                                    <option th:each="mapItem : ${recurrent2String}"
-                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>
-
+<!--                                    <option th:each="mapItem : ${recurrent2String}"-->
+<!--                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>-->
+                                    <option value="1">其他</option>
+                                    <option value="2">无规律复现</option>
+                                    <option value="3">小概率复现</option>
+                                    <option value="4">大概率复现</option>
+                                    <option value="5">必现</option>
                                 </select>
                             </div>
                             <!-- select -->
                             <div class="form-group">
                                 <label>Bug 严重性</label>
                                 <select id="severity" name="severity" class="form-control">
-                                    <option th:each="mapItem : ${severity2String}"
-                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>
+<!--                                    <option th:each="mapItem : ${severity2String}"-->
+<!--                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>-->
+                                    <option value="1">待定</option>
+                                    <option value="2">较轻</option>
+                                    <option value="3">一般</option>
+                                    <option value="4">严重</option>
+                                    <option value="5">紧急</option>
                                 </select>
                             </div>
 
@@ -237,8 +246,15 @@
                             <div class="form-group">
                                 <label>Bug 分类</label>
                                 <select id="category" class="form-control">
-                                    <option th:each="mapItem : ${category2String}"
-                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>
+<!--                                    <option th:each="mapItem : ${category2String}"-->
+<!--                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>-->
+                                    <option value="1">安全</option>
+                                    <option value="2">功能不完整</option>
+                                    <option value="3">性能</option>
+                                    <option value="4">页面布局缺陷</option>
+                                    <option value="5">用户体验</option>
+                                    <option value="6">不正常退出</option>
+                                    <option value="7">其他</option>
                                 </select>
                             </div>
 

src/main/resources/templates/tree_report_new.html

@@ -288,17 +288,26 @@
                             <div class="form-group">
                                 <label>Bug 复现程度</label>
                                 <select id="recurrent" name="recurrent" class="form-control">
-                                    <option th:each="mapItem : ${recurrent2String}"
-                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>
-
+<!--                                    <option th:each="mapItem : ${recurrent2String}"-->
+<!--                                            th:value="${mapItem.key}" th:text="${mapItem.value}" >必现</option>-->
+                                    <option value="1">其他</option>
+                                    <option value="2">无规律复现</option>
+                                    <option value="3">小概率复现</option>
+                                    <option value="4">大概率复现</option>
+                                    <option value="5">必现</option>
                                 </select>
                             </div>
                             <!-- select -->
                             <div class="form-group">
                                 <label>Bug 严重性</label>
                                 <select id="severity" name="severity" class="form-control">
-                                    <option th:each="mapItem : ${severity2String}"
-                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>
+<!--                                    <option th:each="mapItem : ${severity2String}"-->
+<!--                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>-->
+                                    <option value="1">待定</option>
+                                    <option value="2">较轻</option>
+                                    <option value="3">一般</option>
+                                    <option value="4">严重</option>
+                                    <option value="5">紧急</option>
                                 </select>
                             </div>
 
@@ -306,8 +315,15 @@
                             <div class="form-group">
                                 <label>Bug 分类</label>
                                 <select id="category" class="form-control">
-                                    <option th:each="mapItem : ${category2String}"
-                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>
+<!--                                    <option th:each="mapItem : ${category2String}"-->
+<!--                                            th:value="${mapItem.key}" th:text="${mapItem.value}">必现</option>-->
+                                    <option value="1">安全</option>
+                                    <option value="2">功能不完整</option>
+                                    <option value="3">性能</option>
+                                    <option value="4">页面布局缺陷</option>
+                                    <option value="5">用户体验</option>
+                                    <option value="6">不正常退出</option>
+                                    <option value="7">其他</option>
                                 </select>
                             </div>
 
@@ -554,7 +570,7 @@
         $("#new-report-create-block").show()
         // console.log("show create yse")
         $("#new-report-list-block").hide()
-        console.log("show create three")
+        console.log("pshow create three")
 
     }
     function hideCreateBlock() {