代码优化

src/main/java/com/template/api/WelcomeBedControllerAPI.java

@@ -29,7 +29,7 @@ public interface WelcomeBedControllerAPI {
 
     @GetMapping(value = "/queryPageBeds")
     @ApiOperation(value = "床位信息分页数据", notes = "床位信息分页数据", httpMethod = "GET")
-    CommonResult queryPageBeds(@RequestParam int currentPage, @RequestParam int pageCount, String school,Integer buildId,Integer dormitoryId,String sex, Integer isCheck,Integer collegeId, Integer majorId, Integer classstrId);
+    CommonResult queryPageBeds(@RequestParam int currentPage, @RequestParam int pageCount, Integer schoolId,Integer buildId,Integer dormitoryId,String sex, Integer isCheck,Integer collegeId, Integer majorId, Integer classstrId);
 
     @GetMapping(value = "/deleteBedInfo")
     @ApiOperation(value = "删除床位信息", notes = "删除床位信息", httpMethod = "GET")
@@ -45,7 +45,7 @@ public interface WelcomeBedControllerAPI {
 
     @GetMapping(value = "welcomeBedExport")
     @ApiOperation(value = "导出床位信息数据", notes = "导出床位信息数据", httpMethod = "GET")
-    void welcomeBedExport(HttpServletResponse response, String school,Integer buildId,Integer dormitoryId,String sex, Integer isCheck,Integer collegeId, Integer majorId, Integer classstrId);
+    void welcomeBedExport(HttpServletResponse response, Integer schoolId,Integer buildId,Integer dormitoryId,String sex, Integer isCheck,Integer collegeId, Integer majorId, Integer classstrId);
 
 
 }

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

@@ -81,6 +81,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         wb.setNumber(iwbr.getNumber());
         wb.setStudentCard(student.getCardId());
         wb.setSchool(iwbr.getSchool());
+        wb.setSchoolId(iwbr.getSchoolId());
         wb.setBuildId(iwbr.getBuildId());
         wb.setBuild(iwbr.getBuild());
         wb.setDormitoryId(iwbr.getDormitoryId());
@@ -126,6 +127,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         oldData.setNumber(uwbr.getNumber());
         oldData.setStudentCard(student.getCardId());
         oldData.setSchool(uwbr.getSchool());
+        oldData.setSchoolId(uwbr.getSchoolId());
         oldData.setBuildId(uwbr.getBuildId());
         oldData.setBuild(uwbr.getBuild());
         oldData.setDormitoryId(uwbr.getDormitoryId());
@@ -147,8 +149,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     }
 
     @Override
-    public CommonResult queryPageBeds(int currentPage, int pageCount, String school, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId) {
-        PageUtils<WelcomeBed> result = welcomeBedService.queryPageWelcomeBeds(currentPage, pageCount, school, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId);
+    public CommonResult queryPageBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId) {
+        PageUtils<WelcomeBed> result = welcomeBedService.queryPageWelcomeBeds(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId);
         return CommonResult.ok(result);
     }
 
@@ -545,8 +547,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     }
 
     @Override
-    public void welcomeBedExport(HttpServletResponse response, String school, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId) {
-        List<WelcomeBed> result = welcomeBedService.queryPageWelcomeBeds(school, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId);
+    public void welcomeBedExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId) {
+        List<WelcomeBed> result = welcomeBedService.queryPageWelcomeBeds(schoolId, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId);
 
         //导出
         Workbook workbook = new XSSFWorkbook();

src/main/java/com/template/model/pojo/WelcomeBed.java

@@ -43,6 +43,9 @@ public class WelcomeBed implements Serializable {
     @ApiModelProperty(value = "校区名称")
     private String school;
 
+    @ApiModelProperty(value = "校区ID")
+    private Integer schoolId;
+
     @ApiModelProperty(value = "楼栋ID")
     private Integer buildId;
 

src/main/java/com/template/model/request/InsertWelcomeBedRequest.java

@@ -27,6 +27,9 @@ public class InsertWelcomeBedRequest implements Serializable {
     @ApiModelProperty(value = "校区名称")
     private String school;
 
+    @ApiModelProperty(value = "校区ID")
+    private Integer schoolId;
+
     @ApiModelProperty(value = "楼栋ID")
     private Integer buildId;
 

src/main/java/com/template/model/request/UpdateWelcomeBedRequest.java

@@ -27,6 +27,9 @@ public class UpdateWelcomeBedRequest implements Serializable {
     @ApiModelProperty(value = "校区名称")
     private String school;
 
+    @ApiModelProperty(value = "校区ID")
+    private Integer schoolId;
+
     @ApiModelProperty(value = "楼栋ID")
     private Integer buildId;
 

src/main/java/com/template/services/WelcomeBedService.java

@@ -20,7 +20,7 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
 
     int updateWelcomeBed(WelcomeBed rns);
 
-    PageUtils<WelcomeBed> queryPageWelcomeBeds(int currentPage, int pageCount, String school, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId);
+    PageUtils<WelcomeBed> queryPageWelcomeBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId);
 
     int deleteWelcomeBedById(int id);
 
@@ -28,7 +28,7 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
 
     WelcomeBed queryBedData(String school,Integer buildId,Integer dormitoryId,Integer number);
 
-    List<WelcomeBed> queryPageWelcomeBeds( String school, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId);
+    List<WelcomeBed> queryPageWelcomeBeds( Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId);
 
     WelcomeBed getBedByCardId(String studentCard);
 }

src/main/java/com/template/services/impl/WelcomeBedServiceImpl.java

@@ -42,10 +42,10 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
     @Override
-    public PageUtils<WelcomeBed> queryPageWelcomeBeds(int currentPage, int pageCount, String school, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId) {
+    public PageUtils<WelcomeBed> queryPageWelcomeBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId) {
         Page<WelcomeBed> page = new Page<>(currentPage, pageCount);
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("school",school);
+        queryWrapper.eq("school_id",schoolId);
         queryWrapper.eq("build_id",buildId);
         queryWrapper.eq("dormitory_id",dormitoryId);
         queryWrapper.eq("sex",sex);
@@ -82,9 +82,9 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
     @Override
-    public List<WelcomeBed> queryPageWelcomeBeds(String school, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId) {
+    public List<WelcomeBed> queryPageWelcomeBeds(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId) {
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("school",school);
+        queryWrapper.eq("school_id",schoolId);
         queryWrapper.eq("build_id",buildId);
         queryWrapper.eq("dormitory_id",dormitoryId);
         queryWrapper.eq("sex",sex);