excel数据错误判断考虑

service/view/src/main/java/com/founder/view/controller/TbStLayerDataController.java

@@ -55,7 +55,7 @@ public class TbStLayerDataController {
     public MapRestResult uploadDown(@RequestParam("excelFile") MultipartFile excelFile,@RequestParam(required = false) String xxzjbh,
                                     @RequestParam(required = false) String name,@RequestParam(required = false) Double threshold,
                                     @RequestParam(required = false) String lrr,@RequestParam(required = false) String lrdwdm,
-                                    @RequestParam(required = false) String lrdwmc) {
+                                    @RequestParam(required = false) String lrdwmc,HttpServletResponse response) {
         TbStLayer tbStLayer = new TbStLayer();
         List<TbStLayerData> pointLists = null;
         String layerId = xxzjbh;
@@ -76,11 +76,11 @@ public class TbStLayerDataController {
                 tbStLayerService.save(tbStLayer);
                 is = excelFile.getInputStream();
                 //InputStream is = new FileInputStream("C:\\Users\\JBB\\Desktop\\工作目录\\excel\\模板.xlsx");
-                pointLists = parseInputStream(layerId, is);
+                pointLists = parseInputStream(layerId, is,response);
             //错误数据  上传归于同一个用户
             }else{
                 is = excelFile.getInputStream();
-                pointLists = parseInputStream(layerId, is);
+                pointLists = parseInputStream(layerId, is,response);
             }
             return MapRestResult.build(200,"数据上传成功！",pointLists);
         } catch (Exception e) {
@@ -94,7 +94,7 @@ public class TbStLayerDataController {
     }
 
     //将解析excel的代码抽成一个方法   返回错误的数据 类型为list<tbStLayerData>
-    public List<TbStLayerData> parseInputStream(String layerId,InputStream is) throws Exception{
+    public List<TbStLayerData> parseInputStream(String layerId,InputStream is,HttpServletResponse response) throws Exception{
         List<TbStLayerData> pointList = new ArrayList<>();
         XSSFWorkbook sheets = new XSSFWorkbook(is);
         XSSFSheet sheetAt = sheets.getSheetAt(0);
@@ -206,8 +206,17 @@ public class TbStLayerDataController {
                     TbStLayerData errorData = new TbStLayerData();
                     errorData.setxStr(row.getCell(0).getStringCellValue());
                     errorData.setyStr(row.getCell(1).getStringCellValue());
-                    errorData.setTitle(row.getCell(2).getStringCellValue());
-                    errorData.setTimeStr(row.getCell(3).getStringCellValue());
+                    if(row.getCell(2) != null){
+                        errorData.setTitle(row.getCell(2).getStringCellValue());
+                    }else {
+                        errorData.setTitle("");
+                    }
+                    if(row.getCell(3) != null){
+                        errorData.setTimeStr(row.getCell(3).getStringCellValue());
+                    }else {
+                        errorData.setTimeStr("");
+                    }
+                    //errorData.setTimeStr(row.getCell(3).getStringCellValue());
                     pointList.add(errorData);
                 }
             } else {
@@ -237,7 +246,7 @@ public class TbStLayerDataController {
                 }
             }
         }
-           /* XSSFWorkbook wb = new XSSFWorkbook();
+            /*XSSFWorkbook wb = new XSSFWorkbook();
             XSSFSheet sheet = wb.createSheet();
             if(pointList != null && pointList.size() > 0){
                 //输出流写入到excel中
@@ -274,7 +283,7 @@ public class TbStLayerDataController {
             wb.close();
             outputStream.flush();
             outputStream.close();*/
-           /*flag = true;*/
+           //flag = true;
            //return null;
         return pointList;
     }