修改入住接口，移动端用户搜索栏接口

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

@@ -2,6 +2,7 @@ package com.template.api;
 
 import com.template.model.dto.SaveAdminDto;
 import com.template.model.dto.UpdateAdminDto;
+import com.template.model.dto.UsersPageDto;
 import com.template.model.result.CommonResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
@@ -27,9 +28,9 @@ public interface AdminAPI {
     CommonResult delete(@RequestParam int permissionSettingId,@RequestParam int id);
 
 
-    @GetMapping("/getUsersPage")
-    @ApiOperation(value = "移动端用户搜索栏", notes = "移动端用户搜索栏", httpMethod = "GET")
-    CommonResult getUsersPage(int permissionSettingId,int page,int size,String keyWord);
+    @PostMapping("/getUsersPage")
+    @ApiOperation(value = "移动端用户搜索栏", notes = "移动端用户搜索栏", httpMethod = "POST")
+    CommonResult getUsersPage(@RequestBody UsersPageDto usersPageDto);
 
 
     @GetMapping("/userList")

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

@@ -10,12 +10,14 @@ import com.template.common.utils.RSAUtils;
 import com.template.config.MySecurity;
 import com.template.model.dto.SaveAdminDto;
 import com.template.model.dto.UpdateAdminDto;
+import com.template.model.dto.UsersPageDto;
 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.result.CommonResult;
 import com.template.model.vo.AdminVo;
+import com.template.model.vo.UsersVo;
 import com.template.services.AdminMenuService;
 import com.template.services.AdminService;
 import com.template.services.PermissionSettingService;
@@ -219,7 +221,11 @@ public class AdminController implements AdminAPI {
     }
 
     @Override
-    public CommonResult getUsersPage(int permissionSettingId, int page, int size, String keyWord) {
+    public CommonResult getUsersPage(UsersPageDto usersPageDto) {
+        int size = usersPageDto.getSize();
+        Integer page = usersPageDto.getPage();
+        Integer permissionSettingId = usersPageDto.getPermissionSettingId();
+        String keyWord = usersPageDto.getKeyWord();
 
         if (ObjectUtils.isEmpty(page) && page <= 0) {
             page = 1;
@@ -247,7 +253,34 @@ public class AdminController implements AdminAPI {
 
         IPage<Users> page1 = usersService.page(new Page<>(page, size), wrapperU);
 
-        return CommonResult.ok(page1);
+        IPage<UsersVo> page2 = new Page<>();
+
+        BeanUtils.copyProperties(page1,page2);
+
+        List<Users> records = page1.getRecords();
+        ArrayList<UsersVo> usersVos = new ArrayList<>();
+        for (Users record : records) {
+            UsersVo usersVo = new UsersVo();
+            BeanUtils.copyProperties(record,usersVo);
+            String department = record.getDepartment();
+            if ("0".equals(department)) {
+                usersVo.setDepartmentName("其他");
+            }else if ("1".equals(department)){
+                usersVo.setDepartmentName("学生");
+            }else if ("4".equals(department)){
+                usersVo.setDepartmentName("教职工");
+            }else if ("5".equals(department)){
+                usersVo.setDepartmentName("校友");
+            }else if ("6".equals(department)){
+                usersVo.setDepartmentName("访客");
+            }else if ("7".equals(department)){
+                usersVo.setDepartmentName("临时人员");
+            }
+            usersVos.add(usersVo);
+        }
+        page2.setRecords(usersVos);
+
+        return CommonResult.ok(page2);
     }
 
     @Override

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

@@ -494,11 +494,12 @@ public class HouseOrderController implements HouseOrderAPI {
                 String cardNumber = users.getCardNumber();
                 ArrayList<String> strings = new ArrayList<>();
                 strings.add(cardNumber);
-                //        获取手机号
+                //        获取手机号,酒店名字
                 List<ApartmentSetting> list = apartmentSettingService.list(new LambdaQueryWrapper<>());
                 ApartmentSetting apartmentSetting = list.get(0);
                 String phoneNumber = apartmentSetting.getPhoneNumbr();
-                weiXiaoComponent.sendNotice(strings, "公寓办理入住成功", "办理入住成功", "您的房间号为:" + roomNumber + ",密码是:" + passWord + "离店时间为:" + reserveLeaveTime + ",欢迎您入住研究生公寓，我们全体员工很荣幸能为您服务，如有任何需要请致电:"+phoneNumber+"，期待为你服务。祝你生活愉快！", null);
+                String name = apartmentSetting.getName();
+                weiXiaoComponent.sendNotice(strings, "公寓办理入住成功", "办理入住成功", "您的房间号为:" + roomNumber + ",密码是:" + passWord + "离店时间为:" + reserveLeaveTime + ",欢迎您入住"+name+"，我们全体员工很荣幸能为您服务，如有任何需要请致电:"+phoneNumber+"，期待为你服务。祝你生活愉快！", null);
 //              添加锁的操作记录
                 OperatingRecord operatingRecord = new OperatingRecord();
                 operatingRecord.setRoomNumber(houseNumber.getRoomNumber());

src/main/java/com/template/model/dto/UsersPageDto.java

@@ -0,0 +1,12 @@
+package com.template.model.dto;
+
+import lombok.Data;
+
+@Data
+public class UsersPageDto {
+    private Integer permissionSettingId;
+
+    private Integer page;
+    private int size;
+    private String keyWord;
+}

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

@@ -0,0 +1,43 @@
+package com.template.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class UsersVo {
+    @ApiModelProperty(value = "用户表")
+    private Integer id;
+
+    @ApiModelProperty(value = "部门")
+    private String department;
+
+    @ApiModelProperty(value = "部门名称")
+    private String departmentName;
+
+    @ApiModelProperty(value = "用户名")
+    private String userName;
+
+//    @ApiModelProperty(value = "用户角色id")
+//    private String userMenuId;
+
+    @ApiModelProperty(value = "身份证号码")
+    private String idCard;
+
+    @ApiModelProperty(value = "工号")
+    private String cardNumber;
+
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "指纹生成后的编码")
+    private String fingerprint;
+
+    @ApiModelProperty(value = "身份证生成后的编码")
+    private String idCardInformation;
+
+    @ApiModelProperty(value = "微信唯一标识openid")
+    private String openId;
+
+    @ApiModelProperty(value = "头像")
+    private String headImage;
+}