添加换床

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

@@ -8,6 +8,7 @@ import com.template.model.request.UpdateWelcomeBedRequest;
 import com.template.model.result.CommonResult;
 import com.template.model.vo.BatchOperationBedVo;
 import com.template.model.vo.BatchOperationVo;
+import com.template.model.vo.ChangeBedVo;
 import com.template.model.vo.CheckInVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -76,4 +77,15 @@ public interface WelcomeBedControllerAPI {
     @ApiOperation(value = "入住", notes = "入住", httpMethod = "POST")
     CommonResult checkIn(@RequestBody CheckInVo checkInVo);
 
+    @GetMapping(value = "/checkOutDormitory")
+    @ApiOperation(value = "退宿", notes = "退宿", httpMethod = "GET")
+    CommonResult checkOutDormitory(@RequestParam Integer bedId);
+
+    @PostMapping(value = "/changeBed")
+    @ApiOperation(value = "换床", notes = "换床", httpMethod = "POST")
+    CommonResult changeBed(@RequestBody ChangeBedVo changeBedVo);
+
+    @PostMapping(value = "/replaceBed")
+    @ApiOperation(value = "床位对调", notes = "床位对调", httpMethod = "POST")
+    CommonResult replaceBed(@RequestParam Integer bedId);
 }

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

@@ -109,6 +109,9 @@ public class WelcomeAccountController implements WelcomeAccountControllerAPI {
                 record.setWelcomeRole(byId);
             }
 
+            String password = record.getPassword();
+            String decrypt = AesUtils.decrypt(password);
+            record.setPassword(decrypt);
         }
         return CommonResult.ok(pageUtils);
     }

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

@@ -45,7 +45,7 @@ import java.util.stream.Collectors;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author ceshi
@@ -72,16 +72,16 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             return CommonResult.fail(st);
         }
 
-        WelcomeBed existData = welcomeBedService.queryBedData(iwbr.getSchool(),iwbr.getBuildId(),iwbr.getDormitoryId(),iwbr.getNumber());
-        if(existData != null){
+        WelcomeBed existData = welcomeBedService.queryBedData(iwbr.getSchool(), iwbr.getBuildId(), iwbr.getDormitoryId(), iwbr.getNumber());
+        if (existData != null) {
             return CommonResult.fail("该床位号已存在，请勿重复插入！");
         }
 
         WelcomeBed wb = new WelcomeBed();
 
-        if(StringUtils.hasText(iwbr.getCardNum())){
-            WelcomeStudent student =welcomeStudentService.queryStudentInfo(iwbr.getCollegeId(),iwbr.getMajorId(),iwbr.getClassstrId(),iwbr.getCardNum());
-            if(student == null){
+        if (StringUtils.hasText(iwbr.getCardNum())) {
+            WelcomeStudent student = welcomeStudentService.queryStudentInfo(iwbr.getCollegeId(), iwbr.getMajorId(), iwbr.getClassstrId(), iwbr.getCardNum());
+            if (student == null) {
                 return CommonResult.fail("当前学生信息在系统中不存在！");
             }
             wb.setStudentCard(student.getCardId());
@@ -118,18 +118,18 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         }
 
         WelcomeBed oldData = welcomeBedService.getBedById(uwbr.getId());
-        if(oldData == null){
+        if (oldData == null) {
             return CommonResult.fail("床位信息已失效，编辑失败");
         }
 
-        WelcomeBed existData = welcomeBedService.queryBedData(uwbr.getSchool(),uwbr.getBuildId(),uwbr.getDormitoryId(),uwbr.getNumber());
-        if(existData != null && existData.getId().intValue() != uwbr.getId().intValue()){
+        WelcomeBed existData = welcomeBedService.queryBedData(uwbr.getSchool(), uwbr.getBuildId(), uwbr.getDormitoryId(), uwbr.getNumber());
+        if (existData != null && existData.getId().intValue() != uwbr.getId().intValue()) {
             return CommonResult.fail("该床位号已存在，请勿重复插入！");
         }
 
-        if(StringUtils.hasText(uwbr.getCardNum())){
-            WelcomeStudent student =welcomeStudentService.queryStudentInfo(uwbr.getCollegeId(),uwbr.getMajorId(),uwbr.getClassstrId(),uwbr.getCardNum());
-            if(student == null){
+        if (StringUtils.hasText(uwbr.getCardNum())) {
+            WelcomeStudent student = welcomeStudentService.queryStudentInfo(uwbr.getCollegeId(), uwbr.getMajorId(), uwbr.getClassstrId(), uwbr.getCardNum());
+            if (student == null) {
                 return CommonResult.fail("当前学生信息在系统中不存在！");
             }
             oldData.setStudentCard(student.getCardId());
@@ -209,12 +209,12 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         }
 
         List<String> admissNums = result.stream().map(WelcomeBed::getCardNum).distinct().collect(Collectors.toList());
-        if(admissNums != null && admissNums.size() > 0){
+        if (admissNums != null && admissNums.size() > 0) {
             List<WelcomeStudent> students = welcomeStudentService.getDataByAdmissNum(admissNums);
-            if(students != null && students.size() > 0){
-                for (WelcomeBed r:result) {
+            if (students != null && students.size() > 0) {
+                for (WelcomeBed r : result) {
                     Optional<WelcomeStudent> os = students.stream().filter(e -> e.getAdmissNum().equals(r.getCardNum())).findFirst();
-                    if(os != null && os.isPresent()){
+                    if (os != null && os.isPresent()) {
                         r.setStudentCard(os.get().getCardId());
                     }
                 }
@@ -330,8 +330,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                         String dormitory = dataFormatter.formatCellValue(row.getCell(3));//寝室号
                         String number = dataFormatter.formatCellValue(row.getCell(4));//床位号
                         Optional<WelcomeBed> ob = wb.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build)
-                        && e.getDormitory().equals(dormitory) && e.getNumber().intValue() == Integer.valueOf(number).intValue()).findFirst();
-                        if(ob != null && ob.isPresent()){
+                                && e.getDormitory().equals(dormitory) && e.getNumber().intValue() == Integer.valueOf(number).intValue()).findFirst();
+                        if (ob != null && ob.isPresent()) {
                             bedData.setId(ob.get().getId());
                         }
 
@@ -350,18 +350,18 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                         bedData.setSchool(school);
 
                         //楼栋
-                        if(wbils != null && wbils.size() > 0){
+                        if (wbils != null && wbils.size() > 0) {
                             Optional<WelcomeBuild> oBuild = wbils.stream().filter(e -> e.getBuild().equals(build)).findFirst();
-                            if(oBuild != null && oBuild.isPresent()){
+                            if (oBuild != null && oBuild.isPresent()) {
                                 bedData.setBuild(build);
                                 bedData.setBuildId(oBuild.get().getId());
                             }
                         }
 
                         //寝室
-                        if(wds != null && wds.size() > 0){
+                        if (wds != null && wds.size() > 0) {
                             Optional<WelcomeDormitory> oDormitory = wds.stream().filter(e -> e.getDormitory().equals(dormitory)).findFirst();
-                            if(oDormitory != null && oDormitory.isPresent()){
+                            if (oDormitory != null && oDormitory.isPresent()) {
                                 bedData.setDormitory(dormitory);
                                 bedData.setDormitoryId(oDormitory.get().getId());
                             }
@@ -509,7 +509,7 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                         String number = dataFormatter.formatCellValue(row.getCell(4));//床位号
                         Optional<WelcomeBed> ob = wb.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build)
                                 && e.getDormitory().equals(dormitory) && e.getNumber().intValue() == Integer.valueOf(number).intValue()).findFirst();
-                        if(ob != null && ob.isPresent()){
+                        if (ob != null && ob.isPresent()) {
                             bedData.setId(ob.get().getId());
                         }
 
@@ -527,18 +527,18 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
                         bedData.setSchool(school);
 
                         //楼栋
-                        if(wbils != null && wbils.size() > 0){
+                        if (wbils != null && wbils.size() > 0) {
                             Optional<WelcomeBuild> oBuild = wbils.stream().filter(e -> e.getBuild().equals(build)).findFirst();
-                            if(oBuild != null && oBuild.isPresent()){
+                            if (oBuild != null && oBuild.isPresent()) {
                                 bedData.setBuild(build);
                                 bedData.setBuildId(oBuild.get().getId());
                             }
                         }
 
                         //寝室
-                        if(wds != null && wds.size() > 0){
+                        if (wds != null && wds.size() > 0) {
                             Optional<WelcomeDormitory> oDormitory = wds.stream().filter(e -> e.getDormitory().equals(dormitory)).findFirst();
-                            if(oDormitory != null && oDormitory.isPresent()){
+                            if (oDormitory != null && oDormitory.isPresent()) {
                                 bedData.setDormitory(dormitory);
                                 bedData.setDormitoryId(oDormitory.get().getId());
                             }
@@ -642,19 +642,19 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     public CommonResult submit(WelcomeBed welcomeBed) {
         String studentCard = welcomeBed.getStudentCard();
 //        先判断是否已经提交
-        LambdaQueryWrapper<WelcomeBed> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(WelcomeBed::getStudentCard,studentCard);
+        LambdaQueryWrapper<WelcomeBed> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(WelcomeBed::getStudentCard, studentCard);
         WelcomeBed one = welcomeBedService.getOne(wrapper);
         if (ObjectUtils.isNotEmpty(one)) {
             return CommonResult.fail("已提交,请勿重复提交");
         }
 
         WelcomeBed wb = welcomeBedService.getBedById(welcomeBed.getId());
-        if(wb == null){
+        if (wb == null) {
             return CommonResult.fail("床位已失效，选择失败！");
         }
 
-        if(StringUtils.hasText(wb.getStudentCard()) && !wb.getStudentCard().equals(welcomeBed.getStudentCard())){
+        if (StringUtils.hasText(wb.getStudentCard()) && !wb.getStudentCard().equals(welcomeBed.getStudentCard())) {
             return CommonResult.fail("该床位已被其他人入住，选择失败！");
         }
 
@@ -664,18 +664,18 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         WelcomeDormitory welcomeDormitory = welcomeDormitoryService.getById(welcomeBed.getDormitoryId());
         if (ObjectUtils.isNotEmpty(welcomeDormitory)) {
             Integer freeBedNumber = welcomeDormitory.getFreeBedNumber();
-            freeBedNumber=freeBedNumber-1;
-            if (freeBedNumber>0) {
+            freeBedNumber = freeBedNumber - 1;
+            if (freeBedNumber > 0) {
                 welcomeDormitory.setFreeBedNumber(freeBedNumber);
                 welcomeDormitory.setStatus(3);
-            }else if (freeBedNumber==0){
+            } else if (freeBedNumber == 0) {
                 welcomeDormitory.setFreeBedNumber(freeBedNumber);
                 welcomeDormitory.setStatus(1);
             }
             welcomeDormitoryService.updateById(welcomeDormitory);
         }
 
-        if(!updateBed){
+        if (!updateBed) {
             return CommonResult.fail("选宿舍失败");
         }
         return CommonResult.ok();
@@ -694,10 +694,10 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     public CommonResult queryBedDatas(int dormitoryId) {
         List<WelcomeBed> beds = welcomeBedService.queryDormitorys(dormitoryId);
         List<ListVo> datas = new ArrayList<>();
-        for (WelcomeBed bed:beds) {
+        for (WelcomeBed bed : beds) {
             ListVo data = new ListVo();
             data.setId(bed.getId());
-            data.setName(String.valueOf( bed.getNumber()));
+            data.setName(String.valueOf(bed.getNumber()));
             datas.add(data);
         }
         return CommonResult.ok(datas);
@@ -705,10 +705,10 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
 
     @Override
     public CommonResult isCheck(String studentCard) {
-        WelcomeBedCheckVo vo=welcomeBedService.isCheck(studentCard);
+        WelcomeBedCheckVo vo = welcomeBedService.isCheck(studentCard);
         if (ObjectUtils.isEmpty(vo)) {
-           vo=new WelcomeBedCheckVo();
-           vo.setIsCheck(0);
+            vo = new WelcomeBedCheckVo();
+            vo.setIsCheck(0);
         }
         return CommonResult.ok(vo);
     }
@@ -716,8 +716,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     @Override
     public CommonResult batchOperationBed(BatchOperationBedVo batchOperationVo) {
         List<Integer> bedIds = batchOperationVo.getBedIds();
-        LambdaQueryWrapper<WelcomeBed> wrapper=new LambdaQueryWrapper<>();
-        wrapper.in(WelcomeBed::getId,bedIds);
+        LambdaQueryWrapper<WelcomeBed> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(WelcomeBed::getId, bedIds);
         List<WelcomeBed> list = welcomeBedService.list(wrapper);
         if (ObjectUtils.isNotEmpty(list)) {
             for (WelcomeBed welcomeBed : list) {
@@ -730,10 +730,10 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
 
     @Override
     public CommonResult checkIn(CheckInVo checkInVo) {
-        List<WelcomeStudent> list=welcomeStudentService.getStudent(checkInVo);
+        List<WelcomeStudent> list = welcomeStudentService.getStudent(checkInVo);
         if (ObjectUtils.isEmpty(list)) {
             return CommonResult.fail("暂无该学生");
-        }else if (list.size()>1){
+        } else if (list.size() > 1) {
             return CommonResult.fail("该录取号有多个学生,请检查修改后在试");
         }
         WelcomeStudent welcomeStudent = list.get(0);
@@ -753,11 +753,11 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         WelcomeDormitory welcomeDormitory = welcomeDormitoryService.getById(bed.getDormitoryId());
         if (ObjectUtils.isNotEmpty(welcomeDormitory)) {
             Integer freeBedNumber = welcomeDormitory.getFreeBedNumber();
-            freeBedNumber=freeBedNumber-1;
-            if (freeBedNumber>0) {
+            freeBedNumber = freeBedNumber - 1;
+            if (freeBedNumber > 0) {
                 welcomeDormitory.setFreeBedNumber(freeBedNumber);
                 welcomeDormitory.setStatus(3);
-            }else if (freeBedNumber==0){
+            } else if (freeBedNumber == 0) {
                 welcomeDormitory.setFreeBedNumber(freeBedNumber);
                 welcomeDormitory.setStatus(1);
             }
@@ -766,5 +766,73 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
 
         return CommonResult.ok();
     }
+
+    @Override
+    public CommonResult checkOutDormitory(Integer bedId) {
+        WelcomeBed bed = welcomeBedService.getBedById(bedId);
+        if (ObjectUtils.isEmpty(bed)) {
+            return CommonResult.fail("无该床铺信息");
+        }
+        bed.setIsCheck(0);
+        bed.setStudentCard(null);
+        bed.setCardNum(null);
+        bed.setClassstrId(null);
+        bed.setClassstr(null);
+        bed.setName(null);
+        welcomeBedService.updateWelcomeBed(bed);
+
+        //        修改寝室信息
+        WelcomeDormitory welcomeDormitory = welcomeDormitoryService.getById(bed.getDormitoryId());
+        if (ObjectUtils.isNotEmpty(welcomeDormitory)) {
+            Integer freeBedNumber = welcomeDormitory.getFreeBedNumber();
+            Integer bedNumber = welcomeDormitory.getBedNumber();
+            freeBedNumber = freeBedNumber + 1;
+            if (bedNumber.equals(freeBedNumber)) {
+                welcomeDormitory.setFreeBedNumber(freeBedNumber);
+                welcomeDormitory.setStatus(1);
+            } else if (bedNumber > freeBedNumber) {
+                welcomeDormitory.setFreeBedNumber(freeBedNumber);
+                welcomeDormitory.setStatus(3);
+            }
+            welcomeDormitoryService.updateById(welcomeDormitory);
+        }
+        return null;
+    }
+
+    @Override
+    public CommonResult changeBed(ChangeBedVo changeBedVo) {
+        Integer sourceBedId = changeBedVo.getSourceBedId();
+        Integer changeBedId = changeBedVo.getChangeBedId();
+        WelcomeBed sourceBed = welcomeBedService.getBedById(sourceBedId);
+        WelcomeBed changeBed = welcomeBedService.getBedById(changeBedId);
+        if (ObjectUtils.isEmpty(sourceBed) || ObjectUtils.isEmpty(changeBed)) {
+            return CommonResult.fail("床位不存在");
+        }
+        ArrayList<WelcomeBed> welcomeBeds = new ArrayList<>();
+        changeBed.setIsCheck(1);
+        changeBed.setStudentCard(sourceBed.getStudentCard());
+        changeBed.setCardNum(sourceBed.getCardNum());
+        changeBed.setClassstrId(sourceBed.getClassstrId());
+        changeBed.setClassstr(sourceBed.getClassstr());
+        changeBed.setName(sourceBed.getName());
+        welcomeBeds.add(changeBed);
+
+        sourceBed.setIsCheck(0);
+        sourceBed.setStudentCard(null);
+        sourceBed.setCardNum(null);
+        sourceBed.setClassstrId(null);
+        sourceBed.setClassstr(null);
+        sourceBed.setName(null);
+        welcomeBeds.add(sourceBed);
+
+        welcomeBedService.updateBatchById(welcomeBeds);
+
+        return null;
+    }
+
+    @Override
+    public CommonResult replaceBed(Integer bedId) {
+        return null;
+    }
 }
 

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

@@ -52,7 +52,7 @@ public class WelcomeAccount implements Serializable {
     @ApiModelProperty(value = "手机号")
     private String phone;
 
-    @ApiModelProperty(value = "状态 0：冻结 ，1正常")
+    @ApiModelProperty(value = "状态 2：冻结 ，1正常")
     private Integer status;
 
     @ApiModelProperty(value = "创建时间")

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

@@ -76,7 +76,7 @@ public class WelcomeBed implements Serializable {
     @ApiModelProperty(value = "所属班级ID")
     private Integer classstrId;
 
-    @ApiModelProperty(value = "是否入住")
+    @ApiModelProperty(value = "是否入住 1：入住，0：未入住")
     private Integer isCheck;
 
     @ApiModelProperty(value = "学号")

src/main/java/com/template/model/vo/ChangeBedVo.java

@@ -0,0 +1,18 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+@Data
+public class ChangeBedVo {
+
+    /**
+     * 源床位id
+     */
+    private Integer sourceBedId;
+
+    /**
+     * 交换的床位id
+     */
+    private Integer changeBedId;
+
+}

src/main/java/com/template/model/vo/WelcomeAccountVo.java

@@ -40,4 +40,7 @@ public class WelcomeAccountVo {
 
     @ApiModelProperty(value = "状态 0：冻结 ，1正常")
     private Integer status;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
 }

src/main/resources/mapper/template/WelcomeAccountMapper.xml

@@ -13,14 +13,17 @@
         WHERE
             wa.deleted = 0
         <if test="status != null and status != ''">
-            and wa.status= #{status}
+            and wa.status = #{status}
         </if>
+
         <if test="keyWord != null and keyWord != ''">
             and wa.name like '%' #{keyWord} '%'
         </if>
+
         <if test="startTime != null and startTime != '' and endTime != null and endTime != '' ">
             and wa.create_time >= #{startTime} and #{endTime} >= wa.create_time
         </if>
+
         ORDER BY
             wa.create_time
     </select>