修改钥匙管理里的管理端用户角色下拉框，管理端用户下拉框，和修改退房，换房接口

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

@@ -1,11 +1,8 @@
 package com.template.api;
 
-import com.template.model.dto.AdminDto;
 import com.template.model.dto.SaveAdminDto;
 import com.template.model.dto.UpdateAdminDto;
-import com.template.model.pojo.Admin;
 import com.template.model.result.CommonResult;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,4 +30,10 @@ public interface AdminAPI {
     @GetMapping("/getUsersPage")
     @ApiOperation(value = "移动端用户搜索栏", notes = "移动端用户搜索栏", httpMethod = "GET")
     CommonResult getUsersPage(int permissionSettingId,int page,int size,String keyWord);
+
+
+    @GetMapping("/userList")
+    @ApiOperation(value = "管理端用户下拉列表", notes = "用户下拉列表", httpMethod = "GET")
+    CommonResult userList(String adminMenuId);
+
 }

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

@@ -1,8 +1,8 @@
 package com.template.api;
 
-import com.template.model.dto.*;
-import com.template.model.pojo.Admin;
-import com.template.model.pojo.AdminMenu;
+import com.template.model.dto.SaveParentDto;
+import com.template.model.dto.SaveSecondaryDto;
+import com.template.model.dto.UpdateMenuPermissionSettingDto;
 import com.template.model.result.CommonResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
@@ -39,4 +39,8 @@ public interface AdminMenuAPI {
     @ApiOperation(value = "删除角色", notes = "删除角色", httpMethod = "GET")
     CommonResult delete(@RequestParam Integer adminMenuId,@RequestParam String permissionSettingId);
 
+
+    @GetMapping("/getUserRole")
+    @ApiOperation(value = "管理端角色列表", notes = "角色列表", httpMethod = "GET")
+    CommonResult getUserRole();
 }

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

@@ -3,7 +3,6 @@ package com.template.api;
 import com.template.model.dto.UsersDetailsDto;
 import com.template.model.dto.UsersDto;
 import com.template.model.result.CommonResult;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -35,9 +34,6 @@ public interface UsersAPI {
     CommonResult departmentList();
 
 
-    @GetMapping("/userList")
-    @ApiOperation(value = "用户下拉列表", notes = "用户下拉列表", httpMethod = "GET")
-    CommonResult userList(String userMenuId);
 
     @GetMapping("/getUser")
     @ApiOperation(value = "通过用户id找到对应用户", notes = "通过用户id找到对应用户", httpMethod = "GET")

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

@@ -16,9 +16,6 @@ public interface UsersMenuAPI {
     @ApiOperation(value = "添加次级用户", notes = "添加次级用户", httpMethod = "POST")
     CommonResult saveUserSecondary(@RequestBody SaveSecondaryUserDto saveSecondaryUserDto);
 
-    @GetMapping("/getUserRole")
-    @ApiOperation(value = "角色列表", notes = "角色列表", httpMethod = "GET")
-    CommonResult getUserRole();
 
     @GetMapping("/userListPage")
     @ApiOperation(value = "用户角色分页列表", notes = "用户角色分页列表", httpMethod = "GET")

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

@@ -1,7 +1,6 @@
 package com.template.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -15,7 +14,6 @@ import com.template.model.pojo.Admin;
 import com.template.model.pojo.AdminMenu;
 import com.template.model.pojo.PermissionSetting;
 import com.template.model.pojo.Users;
-import com.template.model.request.loginRequest;
 import com.template.model.result.CommonResult;
 import com.template.model.vo.AdminVo;
 import com.template.services.AdminMenuService;
@@ -24,12 +22,8 @@ import com.template.services.PermissionSettingService;
 import com.template.services.UsersService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.security.PublicKey;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -256,6 +250,14 @@ public class AdminController implements AdminAPI {
         return CommonResult.ok(page1);
     }
 
+    @Override
+    public CommonResult userList(String adminMenuId) {
+        LambdaQueryWrapper<Admin> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(Admin::getAdminMenuId,adminMenuId);
+        List<Admin> list = adminService.list(wrapper);
+        return CommonResult.ok(list);
+    }
+
 
 }
 

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

@@ -8,13 +8,11 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.api.AdminMenuAPI;
 import com.template.model.dto.SaveParentDto;
-import com.template.model.dto.SaveParentUserDto;
 import com.template.model.dto.SaveSecondaryDto;
 import com.template.model.dto.UpdateMenuPermissionSettingDto;
 import com.template.model.pojo.Admin;
 import com.template.model.pojo.AdminMenu;
 import com.template.model.pojo.PermissionSetting;
-import com.template.model.pojo.UsersMenu;
 import com.template.model.result.CommonResult;
 import com.template.model.vo.AdminMenuTreeVo;
 import com.template.model.vo.AdminMenuVo;
@@ -25,8 +23,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
@@ -326,7 +322,14 @@ public class AdminMenuController implements AdminMenuAPI {
         return newTrees;
     }
 
+    @Override
+    public CommonResult getUserRole() {
+        Wrapper<AdminMenu> wrapper = new LambdaQueryWrapper<>();
+        List<AdminMenu> adminMenus = adminMenuService.list(wrapper);
+        List<AdminMenuTreeVo> adminMenuTreeVos = QueryAreaTreeRecords(0, adminMenus);
 
+        return CommonResult.ok(adminMenuTreeVos);
+    }
 
 }
 

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

@@ -1182,7 +1182,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             if (ObjectUtils.isNotEmpty(unlocking)) {
 //                删除房间密码
                 passwordIssController.deleteLockUser(unlocking.getLuid(), unlocking.getLockUserId());
-
+                unlockingService.removeById(unlocking);
                 OperatingRecord operatingRecord = new OperatingRecord();
 
                 operatingRecord.setHouseNumberId(houseNumber1.getId());
@@ -1311,7 +1311,6 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         try {
             houseOrder.setOrderStatus("8");
 
-
 //      判断退房在不在预定的时间段中，不在的话则判断是否有人在使用，没有的话按之前的步骤走，有的话则只改订单状态。
             DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             String reserveLeaveTime = houseOrder.getReserveLeaveTime();
@@ -1328,6 +1327,16 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 return CommonResult.ok("该时间段已超过退房时间，已修改其订单状态");
             }
 //            }
+            LambdaQueryWrapper<Unlocking> wrapperU = new LambdaQueryWrapper<>();
+            wrapperU.eq(Unlocking::getOrderNumber, orderNumber)
+                    .eq(Unlocking::getHouseNumberId, houseNumberId);
+            Unlocking unlocking = unlockingService.getOne(wrapperU);
+            if (ObjectUtils.isNotEmpty(unlocking)) {
+//                删除房间密码
+                passwordIssController.deleteLockUser(unlocking.getLuid(), unlocking.getLockUserId());
+                unlockingService.removeById(unlocking);
+            }
+
 
             //      获取水电消费金额和额度
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);

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

@@ -960,7 +960,15 @@ public class HouseOrderController implements HouseOrderAPI {
                 return CommonResult.ok("该时间段已超过退房时间，已修改其订单状态");
             }
 //            }
-
+            LambdaQueryWrapper<Unlocking> wrapperU = new LambdaQueryWrapper<>();
+            wrapperU.eq(Unlocking::getOrderNumber, orderNumber)
+                    .eq(Unlocking::getHouseNumberId, houseNumberId);
+            Unlocking unlocking = unlockingService.getOne(wrapperU);
+            if (ObjectUtils.isNotEmpty(unlocking)) {
+//                删除房间密码
+                passwordIssController.deleteLockUser(unlocking.getLuid(), unlocking.getLockUserId());
+                unlockingService.removeById(unlocking);
+            }
 
 //      修改订单
             houseOrder.setLeaveTime(new Date());
@@ -1198,6 +1206,7 @@ public class HouseOrderController implements HouseOrderAPI {
             if (ObjectUtils.isNotEmpty(unlocking)) {
 //                删除房间密码
                 passwordIssController.deleteLockUser(unlocking.getLuid(), unlocking.getLockUserId());
+                unlockingService.removeById(unlocking);
 
                 OperatingRecord operatingRecord = new OperatingRecord();
                 operatingRecord.setRoomNumber(houseNumber1.getRoomNumber());
@@ -2194,6 +2203,15 @@ public class HouseOrderController implements HouseOrderAPI {
             }
 //            }
 
+            LambdaQueryWrapper<Unlocking> wrapperU = new LambdaQueryWrapper<>();
+            wrapperU.eq(Unlocking::getOrderNumber, orderNumber)
+                    .eq(Unlocking::getHouseNumberId, houseNumberId);
+            Unlocking unlocking = unlockingService.getOne(wrapperU);
+            if (ObjectUtils.isNotEmpty(unlocking)) {
+//                删除房间密码
+                passwordIssController.deleteLockUser(unlocking.getLuid(), unlocking.getLockUserId());
+                unlockingService.removeById(unlocking);
+            }
 
 //      修改订单
             houseOrder.setLeaveTime(new Date());

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

@@ -1,11 +1,9 @@
 package com.template.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.api.UsersAPI;
 import com.template.model.dto.UsersDetailsDto;
@@ -18,12 +16,9 @@ import com.template.model.vo.UsersPageVo;
 import com.template.services.PermissionSettingService;
 import com.template.services.UsersMenuService;
 import com.template.services.UsersService;
-import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
@@ -191,17 +186,7 @@ public class UsersController implements UsersAPI {
         return CommonResult.ok(departmentList);
     }
 
-    @Override
-    public CommonResult userList(String userMenuId) {
-        if (ObjectUtils.isEmpty(userMenuId)) {
-            return CommonResult.fail();
-        }
-       LambdaQueryWrapper<Users> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(Users::getUserMenuId,userMenuId);
-        List<Users> list = usersService.list(wrapper);
 
-        return CommonResult.ok(list);
-    }
 
     @Override
     public CommonResult getUser(String userId) {

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

@@ -1,17 +1,13 @@
 package com.template.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.api.UsersMenuAPI;
-import com.template.model.dto.SaveParentDto;
 import com.template.model.dto.SaveParentUserDto;
 import com.template.model.dto.SaveSecondaryUserDto;
-import com.template.model.dto.UpdateMenuPermissionSettingDto;
-import com.template.model.pojo.AdminMenu;
 import com.template.model.pojo.PermissionSetting;
 import com.template.model.pojo.Users;
 import com.template.model.pojo.UsersMenu;
@@ -21,9 +17,6 @@ import com.template.services.PermissionSettingService;
 import com.template.services.UsersMenuService;
 import com.template.services.UsersService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
@@ -120,14 +113,7 @@ public class UsersMenuController implements UsersMenuAPI {
         return CommonResult.ok();
     }
 
-    @Override
-    public CommonResult getUserRole() {
-        Wrapper<UsersMenu> wrapper = new LambdaQueryWrapper<>();
-        List<UsersMenu> adminMenus = usersMenuService.list(wrapper);
-        List<AdminMenuTreeVo> adminMenuTreeVos = QueryAreaTreeRecords(0, adminMenus);
 
-        return CommonResult.ok(adminMenuTreeVos);
-    }
 
     @Override
     public CommonResult userListPage(int adminMenuId,int page, int size, String keyWord, String startTime, String endTime) {

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

@@ -16,4 +16,6 @@ public class UnlockingKeyVo {
     private String name;
     private String phone;
 
+    private String createTime;
+
 }

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

@@ -11,7 +11,8 @@
                u.start_time     as startTime,
                u.end_time       as endTime,
                ho.live_name     as name,
-               ho.reserve_phone as phone
+               ho.reserve_phone as phone,
+               u.create_time    as createTime
         FROM `unlocking` u
                  LEFT JOIN house_order ho on ho.order_number = u.order_number and ho.deleted = 0
         where u.deleted = 0