更新

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

@@ -29,4 +29,10 @@ public interface WelcomeAccountControllerAPI {
     @GetMapping(value = "/listAccount")
     @ApiOperation(value = "查询账号", notes = "查询账号", httpMethod = "GET")
     CommonResult listAccount(@RequestParam int currentPage, @RequestParam int pageCount,Integer status,String keyWord,String startTime,String endTime);
+
+
+    @GetMapping(value = "/getAccountAuthority")
+    @ApiOperation(value = "查询账号权限", notes = "查询账号权限", httpMethod = "GET")
+    CommonResult getAccountAuthority(@RequestParam Integer accountId);
+
 }

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

@@ -97,6 +97,10 @@ public class LoginController implements LoginControllerAPI {
             return CommonResult.fail("账号不存在");
         }
 
+        if (result.getStatus()!=1) {
+            return CommonResult.fail("账号已冻结");
+        }
+
         String encPassword = AesUtils.encrypt(loginRequest.getPassword());
         if (!encPassword.equals(result.getPassword())) {
             return CommonResult.fail("密码错误");
@@ -109,6 +113,7 @@ public class LoginController implements LoginControllerAPI {
         login.setToken(token);
         login.setTokenTtl(TimeExchange.DateToString(expireTime, "yyyy-MM-dd HH:mm:ss"));
         login.setUserName(result.getName());
+        login.setAccountId(result.getId());
 
         return CommonResult.ok("200", "登录成功", login);
     }

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

@@ -11,6 +11,7 @@ import com.template.model.pojo.WelcomeRole;
 import com.template.model.request.loginRequest;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.AccountAuthorityVo;
 import com.template.model.vo.WelcomeAccountVo;
 import com.template.services.WelcomeAccountService;
 import com.template.services.WelcomeOrgService;
@@ -111,5 +112,44 @@ public class WelcomeAccountController implements WelcomeAccountControllerAPI {
         }
         return CommonResult.ok(pageUtils);
     }
+
+    @Override
+    public CommonResult getAccountAuthority(Integer accountId) {
+
+        WelcomeAccount welcomeAccount = welcomeAccountService.getById(accountId);
+        if (ObjectUtils.isEmpty(welcomeAccount)) {
+            return CommonResult.fail("无该账号");
+        }
+
+        Integer roleId = welcomeAccount.getRoleId();
+        if (ObjectUtils.isEmpty(roleId)) {
+            return CommonResult.fail("无角色权限");
+        }
+
+        String collegeId = welcomeAccount.getCollegeId();
+        if (ObjectUtils.isEmpty(collegeId)) {
+            return CommonResult.fail("无管理部门");
+        }
+
+        WelcomeRole welcomeRole = welcomeRoleService.getById(roleId);
+        if (ObjectUtils.isEmpty(welcomeRole)) {
+            return CommonResult.fail("无该角色");
+        }
+
+        List<String> checkOrg= Arrays.asList(collegeId.split(","));
+        List<WelcomeOrg> checkOrgList= new ArrayList<>();
+        for(int i=0;i<checkOrg.size();i++){
+            WelcomeOrg welcomeOrg= welcomeOrgService.getById(checkOrg.get(i));
+            if (welcomeOrg!=null){
+                checkOrgList.add(welcomeOrg);
+            }
+        }
+
+        AccountAuthorityVo vo = new AccountAuthorityVo();
+        vo.setWelcomeRole(welcomeRole);
+        vo.setWelcomeOrgList(checkOrgList);
+
+        return CommonResult.ok(vo);
+    }
 }
 

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

@@ -582,10 +582,12 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         headerRow.createCell(6).setCellValue("所属学院");
         headerRow.createCell(7).setCellValue("所属专业");
         headerRow.createCell(8).setCellValue("所属班级");
-        headerRow.createCell(9).setCellValue("是否入住");
-        headerRow.createCell(10).setCellValue("录取号");
-        headerRow.createCell(11).setCellValue("姓名");
-        headerRow.createCell(12).setCellValue("备注");
+        headerRow.createCell(9).setCellValue("辅导员");
+        headerRow.createCell(10).setCellValue("是否入住");
+        headerRow.createCell(11).setCellValue("录取号");
+        headerRow.createCell(12).setCellValue("姓名");
+        headerRow.createCell(13).setCellValue("备注");
+        headerRow.createCell(14).setCellValue("是否保留");
         for (int i = 0; i < result.size(); i++) {
             WelcomeBed bed = result.get(i);
             Row dataRow = sheet.createRow(i + 1);
@@ -598,10 +600,13 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             dataRow.createCell(6).setCellValue(bed.getCollege());
             dataRow.createCell(7).setCellValue(bed.getMajor());
             dataRow.createCell(8).setCellValue(bed.getClassstr());
-            dataRow.createCell(9).setCellValue(bed.getIsCheck());
-            dataRow.createCell(10).setCellValue(bed.getCardNum());
-            dataRow.createCell(11).setCellValue(bed.getName());
-            dataRow.createCell(12).setCellValue(bed.getRemark());
+            dataRow.createCell(9).setCellValue(bed.getInstructor());
+            dataRow.createCell(10).setCellValue(bed.getIsCheck());
+            dataRow.createCell(11).setCellValue(bed.getCardNum());
+            dataRow.createCell(12).setCellValue(bed.getName());
+            dataRow.createCell(13).setCellValue(bed.getRemark());
+            dataRow.createCell(14).setCellValue(bed.getRetentionState());
+
         }
         // 将工作簿写入文件
         ExcelUtils.excelDownload(workbook, "床位信息.xlsx", response);
@@ -717,6 +722,22 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
         bed.setClassstr(welcomeStudent.getClassstr());
         bed.setName(welcomeStudent.getName());
         welcomeBedService.updateWelcomeBed(bed);
+
+//        修改寝室信息
+        WelcomeDormitory welcomeDormitory = welcomeDormitoryService.getById(bed.getDormitoryId());
+        if (ObjectUtils.isNotEmpty(welcomeDormitory)) {
+            Integer freeBedNumber = welcomeDormitory.getFreeBedNumber();
+            freeBedNumber=freeBedNumber-1;
+            if (freeBedNumber>0) {
+                welcomeDormitory.setFreeBedNumber(freeBedNumber);
+                welcomeDormitory.setStatus(3);
+            }else if (freeBedNumber==0){
+                welcomeDormitory.setFreeBedNumber(freeBedNumber);
+                welcomeDormitory.setStatus(1);
+            }
+            welcomeDormitoryService.updateById(welcomeDormitory);
+        }
+
         return CommonResult.ok();
     }
 }

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

@@ -611,6 +611,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
         headerRow.createCell(8).setCellValue("空闲床位数");
         headerRow.createCell(9).setCellValue("入住情况");
         headerRow.createCell(10).setCellValue("备注");
+        headerRow.createCell(11).setCellValue("是否保留");
         for (int i = 0; i < result.size(); i++) {
             WelcomeDormitoryVo build = result.get(i);
             Row dataRow = sheet.createRow(i + 1);
@@ -625,6 +626,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
             dataRow.createCell(8).setCellValue(build.getFreeBedNumber());
             dataRow.createCell(9).setCellValue(build.getStatus());
             dataRow.createCell(10).setCellValue(build.getRemark());
+            dataRow.createCell(11).setCellValue(build.getRetentionState());
         }
         // 将工作簿写入文件
         ExcelUtils.excelDownload(workbook, "寝室信息.xlsx", response);

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

@@ -94,6 +94,9 @@ public class WelcomeBed implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "辅导员")
+    private String instructor;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;

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

@@ -0,0 +1,18 @@
+package com.template.model.vo;
+
+import com.template.model.pojo.WelcomeOrg;
+import com.template.model.pojo.WelcomeRole;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.management.relation.Role;
+import java.util.List;
+
+@Data
+public class AccountAuthorityVo {
+    @ApiModelProperty(value = "角色数据")
+    private WelcomeRole welcomeRole;
+
+    @ApiModelProperty(value = "学院数据")
+    private List<WelcomeOrg> welcomeOrgList;
+}

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

@@ -27,4 +27,9 @@ public class LoginVO {
      */
     private String tokenTtl;
 
+    /**
+     * 权限id
+     */
+    private Integer accountId;
+
 }