添加寝室信息管理功能

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

@@ -25,9 +25,13 @@ public interface WelcomeDormitoryControllerAPI {
 
     @GetMapping(value = "/listDormitory")
     @ApiOperation(value = "查询寝室", notes = "查询寝室", httpMethod = "GET")
-    CommonResult listDormitory(@RequestParam int currentPage, @RequestParam int pageCount,String schoolName,String buildName,String dormitory,String sex,Integer status,String gradestr,String college);
+    CommonResult listDormitory(@RequestParam int currentPage, @RequestParam int pageCount,String schoolName,String buildName,String dormitory,String sex,Integer status,String major,String college);
 
 
+    @GetMapping(value = "/dormitoryGroup")
+    @ApiOperation(value = "管理端寝室分组", notes = "管理端寝室分组", httpMethod = "GET")
+    CommonResult dormitoryGroup(String schoolName,String buildName);
+
 
     @GetMapping(value = "/groupBuild")
     @ApiOperation(value = "楼栋分组", notes = "楼栋分组", httpMethod = "GET")

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

@@ -11,6 +11,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @RequestMapping("/api/welcome-student-dormitory")
 public interface WelcomeStudentDormitoryControllerAPI {
 
+    @PostMapping(value = "/saveStudent")
+    @ApiOperation(value = "添加床位", notes = "添加床位", httpMethod = "POST")
+    CommonResult saveStudent(@RequestBody WelcomeStudentDormitory welcomeStudentDormitory);
+
+
     @PostMapping(value = "/submit")
     @ApiOperation(value = "提交床位信息", notes = "提交床位信息", httpMethod = "POST")
     CommonResult submit(@RequestBody WelcomeStudentDormitory welcomeStudentDormitory);

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

@@ -10,6 +10,7 @@ import com.template.model.pojo.WelcomeDormitory;
 import com.template.model.pojo.WelcomeStudent;
 import com.template.model.pojo.WelcomeStudentDormitory;
 import com.template.model.result.CommonResult;
+import com.template.model.result.PageUtils;
 import com.template.services.WelcomeDormitoryService;
 import com.template.services.WelcomeStudentDormitoryService;
 import com.template.services.WelcomeStudentService;
@@ -52,6 +53,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
 
 //        添加时默认全空的
         welcomeDormitory.setStatus(2);
+        welcomeDormitory.setFreeBedNumber(welcomeDormitory.getBedNumber());
 
         welcomeDormitoryService.save(welcomeDormitory);
         return CommonResult.ok();
@@ -86,8 +88,21 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
     }
 
     @Override
-    public CommonResult listDormitory(int currentPage, int pageCount, String schoolName, String buildName, String dormitory, String sex, Integer status, String gradestr, String college) {
-        return null;
+    public CommonResult listDormitory(int currentPage, int pageCount, String schoolName, String buildName, String dormitory, String sex, Integer status, String major, String college) {
+
+        PageUtils<WelcomeDormitory> pageUtils = welcomeDormitoryService.listDormitory(currentPage, pageCount, schoolName, buildName, dormitory, sex, status, major, college);
+
+        return CommonResult.ok(pageUtils);
+    }
+
+    @Override
+    public CommonResult dormitoryGroup(String schoolName, String buildName) {
+        LambdaQueryWrapper<WelcomeDormitory> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ObjectUtils.isNotEmpty(schoolName), WelcomeDormitory::getSchool, schoolName)
+                .eq(ObjectUtils.isNotEmpty(buildName), WelcomeDormitory::getBuild, buildName);
+        List<WelcomeDormitory> list = welcomeDormitoryService.list(wrapper);
+
+        return CommonResult.ok(list);
     }
 
     @Override

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

@@ -47,6 +47,11 @@ public class WelcomeStudentDormitoryController implements WelcomeStudentDormitor
     WelcomeDormitoryService welcomeDormitoryService;
 
     @Override
+    public CommonResult saveStudent(WelcomeStudentDormitory welcomeStudentDormitory) {
+        return null;
+    }
+
+    @Override
     public CommonResult submit(WelcomeStudentDormitory welcomeStudentDormitory) {
         String studentCard = welcomeStudentDormitory.getStudentCard();
         LambdaQueryWrapper<WelcomeStudentDormitory> wrapper=new LambdaQueryWrapper<>();

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

@@ -73,6 +73,8 @@ public class WelcomeDormitory implements Serializable {
     @ApiModelProperty(value = "入住状态 1:满员，2.全空，3.缺额")
     private Integer status;
 
+    @ApiModelProperty(value = "空闲床位数")
+    private Integer freeBedNumber;
 
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)

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

@@ -29,4 +29,6 @@ public interface WelcomeDormitoryService extends IService<WelcomeDormitory> {
     List<String> groupBuild(String sex,String college,String gradestr,String school);
 
     List<String> groupDormitory(String sex,String college,String gradestr,String school,String buildName);
+
+    PageUtils<WelcomeDormitory> listDormitory(int currentPage, int pageCount, String schoolName, String buildName, String dormitory, String sex, Integer status, String major, String college);
 }

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

@@ -1,7 +1,9 @@
 package com.template.services.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.mapper.WelcomeDormitoryMapper;
 import com.template.model.pojo.WelcomeDormitory;
@@ -73,4 +75,20 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
         List<String> result = welcomeDormitoryMapper.groupDormitory(sex,college,gradestr,buildName,school);
         return result;
     }
+
+    @Override
+    public PageUtils<WelcomeDormitory> listDormitory(int currentPage, int pageCount, String schoolName, String buildName, String dormitory, String sex, Integer status, String major, String college) {
+        Page<WelcomeDormitory> page = new Page<>(currentPage, pageCount);
+        LambdaQueryWrapper<WelcomeDormitory> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ObjectUtils.isNotEmpty(schoolName),WelcomeDormitory::getSchool,schoolName)
+                .eq(ObjectUtils.isNotEmpty(buildName),WelcomeDormitory::getBuild,buildName)
+                .eq(ObjectUtils.isNotEmpty(dormitory),WelcomeDormitory::getDormitory,dormitory)
+                .eq(ObjectUtils.isNotEmpty(sex),WelcomeDormitory::getSex,sex)
+                .eq(ObjectUtils.isNotEmpty(status),WelcomeDormitory::getStatus,status)
+                .eq(ObjectUtils.isNotEmpty(major),WelcomeDormitory::getMajor,major)
+                .eq(ObjectUtils.isNotEmpty(college),WelcomeDormitory::getCollege,college);
+
+        IPage<WelcomeDormitory> result = welcomeDormitoryMapper.selectPage(page,queryWrapper);
+        return new PageUtils<>(result);
+    }
 }