更新导入接口

src/main/java/com/template/controller/WelcomeBedController.java

@@ -392,7 +392,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                                 bedData.setSchoolId(wsl.get().getId());
                                 bedData.setSchool(school);
                             } else {
-                                return CommonResult.fail("第" + rowNum + 1 + "行,不存在该校区");
+                                int h=rowNum+1;
+                                return CommonResult.fail("第" +h+ "行,不存在该校区");
                             }
                         }
 
@@ -403,7 +404,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                                 bedData.setBuild(build);
                                 bedData.setBuildId(oBuild.get().getId());
                             }else {
-                                return CommonResult.fail("第" + rowNum + 1 + "行,不存在该楼栋");
+                                int h=rowNum+1;
+                                return CommonResult.fail("第" + h + "行,不存在该楼栋");
                             }
                         }
 
@@ -412,16 +414,19 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             Optional<WelcomeDormitory> oDormitory = wds.stream().filter(e -> e.getDormitory().equals(dormitory)).findFirst();
                             if (oDormitory != null && oDormitory.isPresent()) {
                                 if (!oDormitory.get().getSex().equals(sex)) {
-                                    return CommonResult.fail("第" + rowNum + 1 + "行,床位性别和寝室性别不一致");
+                                    int h=rowNum+1;
+                                    return CommonResult.fail("第" + h + "行,床位性别和寝室性别不一致");
                                 }
                                 if (!oDormitory.get().getCollege().equals(college)) {
-                                    return CommonResult.fail("第" + rowNum + 1 + "行,床位院系和寝室院系不一致");
+                                    int h=rowNum+1;
+                                    return CommonResult.fail("第" + h + "行,床位院系和寝室院系不一致");
                                 }
 
                                 bedData.setDormitory(dormitory);
                                 bedData.setDormitoryId(oDormitory.get().getId());
                             }else {
-                                return CommonResult.fail("第" + rowNum + 1 + "行,不存在该寝室号");
+                                int h=rowNum+1;
+                                return CommonResult.fail("第" + h + "行,不存在该寝室号");
                             }
                         }
 
@@ -434,7 +439,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             bedData.setCollege(college);
                             bedData.setCollegeId(owo.get().getId());
                         }else {
-                            return CommonResult.fail("第" + rowNum + 1 + "行,不存在该院系");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第" + h + "行,不存在该院系");
                         }
 
                         Optional<WelcomeOrg> omwo = wos.stream().filter(e -> e.getName().equals(major)).findFirst();
@@ -442,7 +448,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             bedData.setMajor(major);
                             bedData.setMajorId(omwo.get().getId());
                         }else {
-                            return CommonResult.fail("第" + rowNum + 1 + "行,不存在该专业");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第" + h + "行,不存在该专业");
                         }
 
                         Optional<WelcomeOrg> ocwo = wos.stream().filter(e -> e.getName().equals(classstr)).findFirst();
@@ -450,7 +457,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             bedData.setClassstr(classstr);
                             bedData.setClassstrId(ocwo.get().getId());
                         }else {
-                            return CommonResult.fail("第" + rowNum + 1 + "行,不存在该班级");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第" + h + "行,不存在该班级");
                         }
                         //endregion
 
@@ -576,7 +584,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                                 bedData.setSchoolId(wsl.get().getId());
                                 bedData.setSchool(school);
                             } else {
-                                return CommonResult.fail("第" + rowNum + 1 + "行,不存在该校区");
+                                int h=rowNum+1;
+                                return CommonResult.fail("第" + h + "行,不存在该校区");
                             }
                         }
 
@@ -587,7 +596,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                                 bedData.setBuild(build);
                                 bedData.setBuildId(oBuild.get().getId());
                             }else {
-                                return CommonResult.fail("第" + rowNum + 1 + "行,不存在该楼栋");
+                                int h=rowNum+1;
+                                return CommonResult.fail("第" + h + "行,不存在该楼栋");
                             }
                         }
 
@@ -596,16 +606,19 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             Optional<WelcomeDormitory> oDormitory = wds.stream().filter(e -> e.getDormitory().equals(dormitory)).findFirst();
                             if (oDormitory != null && oDormitory.isPresent()) {
                                 if (!oDormitory.get().getSex().equals(sex)) {
-                                    return CommonResult.fail("第" + rowNum + 1 + "行,床位性别和寝室性别不一致");
+                                    int h=rowNum+1;
+                                    return CommonResult.fail("第" + h + "行,床位性别和寝室性别不一致");
                                 }
                                 if (!oDormitory.get().getCollege().equals(college)) {
-                                    return CommonResult.fail("第" + rowNum + 1 + "行,床位院系和寝室院系不一致");
+                                    int h=rowNum+1;
+                                    return CommonResult.fail("第" + h + "行,床位院系和寝室院系不一致");
                                 }
 
                                 bedData.setDormitory(dormitory);
                                 bedData.setDormitoryId(oDormitory.get().getId());
                             }else {
-                                return CommonResult.fail("第" + rowNum + 1 + "行,不存在该寝室号");
+                                int h=rowNum+1;
+                                return CommonResult.fail("第" + h + "行,不存在该寝室号");
                             }
                         }
 
@@ -618,7 +631,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             bedData.setCollege(college);
                             bedData.setCollegeId(owo.get().getId());
                         }else {
-                            return CommonResult.fail("第" + rowNum + 1 + "行,不存在该院系");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第" + h + "行,不存在该院系");
                         }
 
                         Optional<WelcomeOrg> omwo = wos.stream().filter(e -> e.getName().equals(major)).findFirst();
@@ -626,7 +640,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             bedData.setMajor(major);
                             bedData.setMajorId(omwo.get().getId());
                         }else {
-                            return CommonResult.fail("第" + rowNum + 1 + "行,不存在该专业");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第" + h + "行,不存在该专业");
                         }
 
                         Optional<WelcomeOrg> ocwo = wos.stream().filter(e -> e.getName().equals(classstr)).findFirst();
@@ -634,7 +649,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                             bedData.setClassstr(classstr);
                             bedData.setClassstrId(ocwo.get().getId());
                         }else {
-                            return CommonResult.fail("第" + rowNum + 1 + "行,不存在该班级");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第" + h + "行,不存在该班级");
                         }
                         //endregion
 

src/main/java/com/template/controller/WelcomeBuildController.java

@@ -226,7 +226,8 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
                         if (wos != null && wos.isPresent()) {
                             buildData.setSchoolId(wos.get().getId()+"");
                         }else {
-                            return CommonResult.fail("第"+rowNum+1+"行,不存在该校区");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第"+h+"行,不存在该校区");
                         }
                         String build = dataFormatter.formatCellValue(row.getCell(2));//楼栋名称
                         Optional<WelcomeBuild> ob = wb.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build)).findFirst();
@@ -324,7 +325,8 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
                         if (wos != null && wos.isPresent()) {
                             buildData.setSchoolId(wos.get().getId()+"");
                         }else {
-                            return CommonResult.fail("第"+rowNum+1+"行,不存在该校区");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第"+h+"行,不存在该校区");
                         }
                         String build = dataFormatter.formatCellValue(row.getCell(2));//楼栋名称
                         Optional<WelcomeBuild> ob = wb.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build)).findFirst();

src/main/java/com/template/controller/WelcomeDormitoryController.java

@@ -468,20 +468,23 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                             wd.setSchoolId(wos.get().getId());
                             wd.setSchool(school);
                         }else {
-                            return CommonResult.fail("第"+rowNum+1+"行,不存在该校区");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第"+h+"行,不存在该校区");
                         }
 
 
                         Optional<WelcomeBuild> oBuild = buildDatas.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build)).findFirst();
                         if (oBuild != null && oBuild.isPresent()) {
                             if (!sex.equals(oBuild.get().getSex())) {
-                                return CommonResult.fail("第"+rowNum+1+"行,宿舍性别和楼栋性别不一致");
+                                int h=rowNum+1;
+                                return CommonResult.fail("第"+h+"行,宿舍性别和楼栋性别不一致");
                             }
                             wd.setBuild(build);
                             wd.setBuildId(oBuild.get().getId());
 
                         }else {
-                            return CommonResult.fail("第"+rowNum+1+"行,不存在该楼栋");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第"+h+"行,不存在该楼栋");
                         }
                         wd.setDormitory(dormitory);
                         wd.setSex(sex);
@@ -491,7 +494,8 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                             wd.setCollege(college);
                             wd.setCollegeId(oCollege.get().getId());
                         }else {
-                            return CommonResult.fail("第"+rowNum+1+"行,不存在该学院");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第"+h+"行,不存在该学院");
                         }
 
                         wd.setBedNumber(Integer.valueOf(bedNum));
@@ -600,19 +604,22 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                             wd.setSchoolId(wos.get().getId());
                             wd.setSchool(school);
                         }else {
-                            return CommonResult.fail("第"+rowNum+1+"行,不存在该校区");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第"+h+"行,不存在该校区");
                         }
 
                         Optional<WelcomeBuild> oBuild = buildDatas.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build)).findFirst();
                         if (oBuild != null && oBuild.isPresent()) {
                             if (!sex.equals(oBuild.get().getSex())) {
-                                return CommonResult.fail("第"+rowNum+1+"行,宿舍性别和楼栋性别不一致");
+                                int h=rowNum+1;
+                                return CommonResult.fail("第"+h+"行,宿舍性别和楼栋性别不一致");
                             }
                             wd.setBuild(build);
                             wd.setBuildId(oBuild.get().getId());
 
                         }else {
-                            return CommonResult.fail("第"+rowNum+1+"行,不存在该楼栋");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第"+h+"行,不存在该楼栋");
                         }
                         wd.setDormitory(dormitory);
                         wd.setSex(sex);
@@ -622,7 +629,8 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                             wd.setCollege(college);
                             wd.setCollegeId(oCollege.get().getId());
                         }else {
-                            return CommonResult.fail("第"+rowNum+1+"行,不存在该学院");
+                            int h=rowNum+1;
+                            return CommonResult.fail("第"+h+"行,不存在该学院");
                         }
 
                         wd.setBedNumber(Integer.valueOf(bedNum));