Browse Source

最新代码

liu 2 years ago
parent
commit
6fd0602a1e
47 changed files with 251 additions and 724 deletions
  1. 39 198
      .idea/workspace.xml
  2. 11 0
      src/main/java/com/template/api/AdminAPI.java
  3. 3 1
      src/main/java/com/template/api/AdminMenuAPI.java
  4. 3 5
      src/main/java/com/template/api/LoginControllerAPI.java
  5. 0 34
      src/main/java/com/template/api/RepairAdminControllerAPI.java
  6. 4 0
      src/main/java/com/template/api/UsersMenuAPI.java
  7. 3 4
      src/main/java/com/template/common/utils/JWTUtil.java
  8. 15 11
      src/main/java/com/template/common/utils/RSAUtils.java
  9. 17 0
      src/main/java/com/template/controller/AdminController.java
  10. 36 0
      src/main/java/com/template/controller/AdminMenuController.java
  11. 67 56
      src/main/java/com/template/controller/LoginController.java
  12. 0 163
      src/main/java/com/template/controller/RepairAdminController.java
  13. 44 8
      src/main/java/com/template/controller/UsersMenuController.java
  14. 0 17
      src/main/java/com/template/mapper/RepairAdminMapper.java
  15. 0 3
      src/main/java/com/template/model/pojo/Admin.java
  16. 0 81
      src/main/java/com/template/model/pojo/RepairAdmin.java
  17. 2 2
      src/main/java/com/template/model/pojo/Users.java
  18. 4 1
      src/main/java/com/template/model/request/changePasswordRequest.java
  19. 3 4
      src/main/java/com/template/model/vo/LoginVO.java
  20. 0 31
      src/main/java/com/template/services/RepairAdminService.java
  21. 0 5
      src/main/java/com/template/services/impl/AdminServiceImpl.java
  22. 0 90
      src/main/java/com/template/services/impl/RepairAdminServiceImpl.java
  23. 0 5
      src/main/resources/mapper/template/RepairAdminMapper.xml
  24. BIN
      target/classes/com/repair/model/request/changePasswordRequest.class
  25. BIN
      target/classes/com/template/api/AdminAPI.class
  26. BIN
      target/classes/com/template/api/AdminMenuAPI.class
  27. BIN
      target/classes/com/template/api/LoginControllerAPI.class
  28. BIN
      target/classes/com/template/api/RepairAdminControllerAPI.class
  29. BIN
      target/classes/com/template/api/UsersMenuAPI.class
  30. BIN
      target/classes/com/template/common/utils/JWTUtil.class
  31. BIN
      target/classes/com/template/common/utils/RSAUtils.class
  32. BIN
      target/classes/com/template/controller/AdminController.class
  33. BIN
      target/classes/com/template/controller/AdminMenuController.class
  34. BIN
      target/classes/com/template/controller/LoginController.class
  35. BIN
      target/classes/com/template/controller/RepairAdminController.class
  36. BIN
      target/classes/com/template/controller/UsersController.class
  37. BIN
      target/classes/com/template/controller/UsersMenuController.class
  38. BIN
      target/classes/com/template/mapper/RepairAdminMapper.class
  39. BIN
      target/classes/com/template/model/pojo/Admin.class
  40. BIN
      target/classes/com/template/model/pojo/RepairAdmin.class
  41. BIN
      target/classes/com/template/model/pojo/Users.class
  42. BIN
      target/classes/com/template/model/request/changePasswordRequest.class
  43. BIN
      target/classes/com/template/model/vo/LoginVO.class
  44. BIN
      target/classes/com/template/services/RepairAdminService.class
  45. BIN
      target/classes/com/template/services/impl/AdminServiceImpl.class
  46. BIN
      target/classes/com/template/services/impl/RepairAdminServiceImpl.class
  47. 0 5
      target/classes/mapper/template/RepairAdminMapper.xml

+ 39 - 198
.idea/workspace.xml

@@ -5,226 +5,52 @@
   </component>
   </component>
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="42a0d34b-c484-4704-92dd-be5ac61d2f66" name="Changes" comment="">
     <list default="true" id="42a0d34b-c484-4704-92dd-be5ac61d2f66" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/annotation/Generator.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/annotation/IgnorePermissionsCheck.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/SaveParentUserDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/SaveSecondaryUserDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/UsersDetailsDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/UsersDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/result/Result.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/AdminMenuTreeVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/PermissionsDetailVO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/PermissionsTreeVO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/PermissionsVO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/AdminAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/AdminAPI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/AdminMenuAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/AdminMenuAPI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/AdminMenuAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/AdminMenuAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/ClassScheduleAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/ClassScheduleAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/UsersAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/UsersAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/LoginControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/LoginControllerAPI.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/RepairAdminControllerAPI.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/UsersMenuAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/UsersMenuAPI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/UsersMenuAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/UsersMenuAPI.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/JWTUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/JWTUtil.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/JWTUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/JWTUtil.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/RSAUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/RSAUtils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/AdminController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/AdminController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/AdminMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/AdminMenuController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/AdminMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/AdminMenuController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/HousePriceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/HousePriceController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/PermissionSettingController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/PermissionSettingController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/UsersController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/UsersController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/RepairAdminController.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/UsersMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/UsersMenuController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/UsersMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/UsersMenuController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/AdminMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/AdminMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/dto/SaveParentDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/SaveParentDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/dto/SaveSecondaryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/SaveSecondaryDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/RepairAdminMapper.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/Admin.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/Admin.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/Admin.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/Admin.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/RepairAdmin.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/Users.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/Users.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/Users.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/Users.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/UsersMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/UsersMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/request/changePasswordRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/request/changePasswordRequest.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/LoginVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/LoginVO.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/LoginVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/LoginVO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/AdminService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/AdminService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/RepairAdminService.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/AdminServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/AdminServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/AdminServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/AdminServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/PermissionSettingMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/PermissionSettingMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/repair/model/request/changePasswordRequest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/repair/model/request/changePasswordRequest.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/repair/model/request/freezeRepairAdminRequest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/repair/model/request/freezeRepairAdminRequest.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/repair/model/request/queryAccountPageRequest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/repair/model/request/queryAccountPageRequest.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/repair/model/request/updateRepairAdminRequest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/repair/model/request/updateRepairAdminRequest.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/AutoCode.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/AutoCode.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/MybatisPlusApplication.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/MybatisPlusApplication.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/aop/LoginCheckAspect.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/aop/LoginCheckAspect.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/RepairAdminServiceImpl.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/RepairAdminMapper.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/repair/model/request/changePasswordRequest.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/AdminAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/AdminAPI.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/AdminMenuAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/AdminMenuAPI.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/AdminMenuAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/AdminMenuAPI.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/ClassScheduleAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/ClassScheduleAPI.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/ExcelControllerAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/ExcelControllerAPI.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/HouseAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/HouseAPI.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/HouseNumberStateAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/HouseNumberStateAPI.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/HouseOrderAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/HouseOrderAPI.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/HousePriceAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/HousePriceAPI.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/LoginControllerAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/LoginControllerAPI.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/LoginControllerAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/LoginControllerAPI.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/RepairAdminControllerAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/RepairAdminControllerAPI.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/UsersAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/UsersAPI.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/RepairAdminControllerAPI.class" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/UsersMenuAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/UsersMenuAPI.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/UsersMenuAPI.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/api/UsersMenuAPI.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/exception/EmsException.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/exception/EmsException.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/exception/EmsExceptionHandler.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/exception/EmsExceptionHandler.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/exception/MyCustomException.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/exception/MyCustomException.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/result/ResponseStatusEnum.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/result/ResponseStatusEnum.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/AES.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/AES.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/AesUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/AesUtils.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/CommonUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/CommonUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/DateUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/DateUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/DoorLockAESUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/DoorLockAESUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/DoorLockMD5Util.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/DoorLockMD5Util.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/EncryptionUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/EncryptionUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/ExcelUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/ExcelUtils.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/FileUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/FileUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/Func.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/Func.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/HttpClientHelper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/HttpClientHelper.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/JWTUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/JWTUtil.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/JWTUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/JWTUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/MD5.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/MD5.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/MyBase64.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/MyBase64.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/RSAUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/RSAUtils.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/RSAUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/RSAUtils.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/SendSms.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/SendSms.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/ValidateCode.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/ValidateCode.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/WaterElectricDataEncAndDecUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/WaterElectricDataEncAndDecUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/WaterElectricSignUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/WaterElectricSignUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/paramUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/paramUtils.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/weixin/DictionaryCompare.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/weixin/DictionaryCompare.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/weixin/EndPay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/weixin/EndPay.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/weixin/JaxbUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/weixin/JaxbUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/weixin/PayWxUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/weixin/PayWxUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/weixin/TongYiReturn.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/common/utils/weixin/TongYiReturn.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/component/WaterElectricComponent.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/component/WaterElectricComponent.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/component/WeiXiaoComponent$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/component/WeiXiaoComponent$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/component/WeiXiaoComponent.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/component/WeiXiaoComponent.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/config/DoorLockConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/config/DoorLockConfig.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/config/MySecurity.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/config/MySecurity.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/config/WaterElectricConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/config/WaterElectricConfig.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/config/WeixiaoConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/config/WeixiaoConfig.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/AdminController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/AdminController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/AdminMenuController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/AdminMenuController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/AdminMenuController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/AdminMenuController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/ClassScheduleController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/ClassScheduleController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/ExcelController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/ExcelController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HouseController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/HouseController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HouseNumberStateController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/HouseNumberStateController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HouseOrderController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/HouseOrderController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HousePriceController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/HousePriceController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/LoginController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/LoginController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/LoginController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/LoginController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/PasswordIssController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/PasswordIssController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/PermissionSettingController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/PermissionSettingController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/RepairAdminController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/RepairAdminController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/UploadServlet.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/UploadServlet.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/RepairAdminController.class" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/UsersController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/UsersController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/UsersController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/UsersController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/UsersMenuController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/UsersMenuController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/UsersMenuController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/UsersMenuController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/core/CORSConfiguration$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/core/CORSConfiguration$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/core/JwtAuthenticationInterceptor.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/core/JwtAuthenticationInterceptor.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/core/JwtlnterceptorConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/core/JwtlnterceptorConfig.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/core/ReplaceStreamFilter.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/core/ReplaceStreamFilter.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/core/RequestWrapper$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/core/RequestWrapper$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/core/RequestWrapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/core/RequestWrapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/handle/NonStaticResourceHttpRequestHandler.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/handle/NonStaticResourceHttpRequestHandler.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/handler/MyMetaObjectHandler.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/handler/MyMetaObjectHandler.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/ClassScheduleMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/mapper/ClassScheduleMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseLockMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseLockMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseNumberMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseNumberMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseNumberStateMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseNumberStateMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseOrderMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseOrderMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HousePriceMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/mapper/HousePriceMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/AlterDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/AlterDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/AlterPriceDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/AlterPriceDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/BillHandleResultDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/BillHandleResultDTO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/CancelDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/CancelDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/CardInfoDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/CardInfoDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/CheckIdCardDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/CheckIdCardDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/CheckOutDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/CheckOutDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/CleanRoomDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/CleanRoomDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/DirtyRoomDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/DirtyRoomDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/EstablishOrderDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/EstablishOrderDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/EventMessageDTO$EventMessageDTOBuilder.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/EventMessageDTO$EventMessageDTOBuilder.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/EventMessageDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/EventMessageDTO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/FingerprintDataDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/FingerprintDataDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/HouseDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/HouseDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/HousePriceAlterDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/HousePriceAlterDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/LockRoomDTO$LockRoomDTOBuilder.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/LockRoomDTO$LockRoomDTOBuilder.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/LockRoomDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/LockRoomDTO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/MaintainDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/MaintainDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/PasswordDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/PasswordDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/ReserveDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/ReserveDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/RoomChangeDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/dto/RoomChangeDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/enumModel/PasswordUrlEnum.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/enumModel/PasswordUrlEnum.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/enumModel/eIsSuper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/enumModel/eIsSuper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/enumModel/eStatu.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/enumModel/eStatu.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/RepairAdminMapper.class" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/Admin.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/Admin.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/Admin.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/Admin.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/AdminMenu.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/AdminMenu.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/ClassSchedule.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/ClassSchedule.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/House.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/House.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseLock.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseLock.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseNumber.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseNumber.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseNumberState.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseNumberState.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseOrder.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseOrder.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseOrderBill.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseOrderBill.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HousePrice.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HousePrice.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/LockRoomDto.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/LockRoomDto.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/PermissionSetting.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/PermissionSetting.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/RepairAdmin.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/RepairAdmin.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/Unlocking.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/Unlocking.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/RepairAdmin.class" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/Users.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/Users.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/Users.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/Users.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/UsersMenu.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/pojo/UsersMenu.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/request/loginRequest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/request/loginRequest.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/result/BaseResult.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/result/BaseResult.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/result/CommonResult.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/result/CommonResult.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/result/PageUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/result/PageUtils.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/AlterPriceRecordVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/AlterPriceRecordVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/CalendarPageVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/CalendarPageVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/ClassListVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/ClassListVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseNumberStateDateVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseNumberStateDateVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseNumberStatePageVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseNumberStatePageVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseOrderPageListVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseOrderPageListVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HousePricePageVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/HousePricePageVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HousePriceVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/HousePriceVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseStateVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseStateVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseStustaVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseStustaVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HousedetailsVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/HousedetailsVo.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/LoginVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/LoginVO.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/LoginVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/LoginVO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/ParticularHouseNumberStatusVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/ParticularHouseNumberStatusVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/PriceVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/PriceVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/QueryExportVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/QueryExportVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/ReserveDayVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/ReserveDayVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/RoomTypeVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/RoomTypeVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/ScheduleVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/vo/ScheduleVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/AccessToken.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/weixin/AccessToken.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/CodeEntity.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/weixin/CodeEntity.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/CodeEntityVo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/weixin/CodeEntityVo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/Ordering.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/weixin/Ordering.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/Pay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/weixin/Pay.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/PayResult.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/weixin/PayResult.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/Users.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/weixin/Users.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/WechatResult.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/weixin/WechatResult.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/WechatUnifiedOrder.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/weixin/WechatUnifiedOrder.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/Wechat_userinfo.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/weixin/Wechat_userinfo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/Wx_user.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/model/weixin/Wx_user.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/AdminService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/AdminService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/ClassScheduleService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/ClassScheduleService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/HouseLockService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/HouseLockService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/HouseNumberService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/HouseNumberService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/HouseNumberStateService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/HouseNumberStateService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/HouseOrderService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/HouseOrderService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/HousePriceService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/HousePriceService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/HouseService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/HouseService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/PermissionSettingService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/PermissionSettingService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/RepairAdminService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/RepairAdminService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/RepairAdminService.class" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/AdminServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/impl/AdminServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/AdminServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/impl/AdminServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/ClassScheduleServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/impl/ClassScheduleServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseLockServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseLockServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseNumberServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseNumberServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseNumberStateServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseNumberStateServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseOrderServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseOrderServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HousePriceServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/impl/HousePriceServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/PermissionSettingServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/impl/PermissionSettingServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/RepairAdminServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/impl/RepairAdminServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/PermissionSettingMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/template/PermissionSettingMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/RepairAdminServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/RepairAdminMapper.xml" beforeDir="false" />
     </list>
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -321,6 +147,19 @@
         <option name="Make" enabled="true" />
         <option name="Make" enabled="true" />
       </method>
       </method>
     </configuration>
     </configuration>
+    <configuration name="RSAUtils" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.template.common.utils.RSAUtils" />
+      <module name="iHotel_student_houtai" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.template.common.utils.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="UsersMenuController" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
     <configuration name="UsersMenuController" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.template.controller.UsersMenuController" />
       <option name="MAIN_CLASS_NAME" value="com.template.controller.UsersMenuController" />
       <module name="iHotel_student_houtai" />
       <module name="iHotel_student_houtai" />
@@ -350,11 +189,13 @@
     </configuration>
     </configuration>
     <list>
     <list>
       <item itemvalue="Application.AutoCode" />
       <item itemvalue="Application.AutoCode" />
+      <item itemvalue="Application.RSAUtils" />
       <item itemvalue="Application.UsersMenuController" />
       <item itemvalue="Application.UsersMenuController" />
       <item itemvalue="Spring Boot.MybatisPlusApplication" />
       <item itemvalue="Spring Boot.MybatisPlusApplication" />
     </list>
     </list>
     <recent_temporary>
     <recent_temporary>
       <list>
       <list>
+        <item itemvalue="Application.RSAUtils" />
         <item itemvalue="Application.UsersMenuController" />
         <item itemvalue="Application.UsersMenuController" />
         <item itemvalue="Application.AutoCode" />
         <item itemvalue="Application.AutoCode" />
       </list>
       </list>
@@ -373,7 +214,7 @@
       <updated>1700186263832</updated>
       <updated>1700186263832</updated>
       <workItem from="1700186265128" duration="1452000" />
       <workItem from="1700186265128" duration="1452000" />
       <workItem from="1700187845025" duration="272442000" />
       <workItem from="1700187845025" duration="272442000" />
-      <workItem from="1701824578863" duration="123940000" />
+      <workItem from="1701824578863" duration="148698000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
@@ -471,7 +312,7 @@
         </line-breakpoint>
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/UsersMenuController.java</url>
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/UsersMenuController.java</url>
-          <line>98</line>
+          <line>101</line>
           <option name="timeStamp" value="72" />
           <option name="timeStamp" value="72" />
         </line-breakpoint>
         </line-breakpoint>
       </breakpoints>
       </breakpoints>

+ 11 - 0
src/main/java/com/template/api/AdminAPI.java

@@ -1,7 +1,18 @@
 package com.template.api;
 package com.template.api;
 
 
+import com.template.model.result.CommonResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 
 @RequestMapping("/auto/admin")
 @RequestMapping("/auto/admin")
 public interface AdminAPI {
 public interface AdminAPI {
+
+    @GetMapping("/getListPage")
+    @ApiOperation(value = "管理端用户页面展示", notes = "管理端用户页面展示", httpMethod = "GET")
+    CommonResult getListPage(int page,int size,String keyWord );
+
+
+
+
 }
 }

+ 3 - 1
src/main/java/com/template/api/AdminMenuAPI.java

@@ -26,7 +26,9 @@ public interface AdminMenuAPI {
     @ApiOperation(value = "角色列表", notes = "角色列表", httpMethod = "GET")
     @ApiOperation(value = "角色列表", notes = "角色列表", httpMethod = "GET")
     CommonResult getRole();
     CommonResult getRole();
 
 
-
+    @GetMapping("/adminListPage")
+    @ApiOperation(value = "管理端角色分页列表", notes = "管理端角色分页列表", httpMethod = "GET")
+    CommonResult adminListPage(int adminMenuId,int page,int size,String keyWord,String startTime,String endTime);
 
 
 
 
 
 

+ 3 - 5
src/main/java/com/template/api/LoginControllerAPI.java

@@ -1,6 +1,6 @@
 package com.template.api;
 package com.template.api;
 
 
-import com.template.model.pojo.RepairAdmin;
+import com.template.model.request.changePasswordRequest;
 import com.template.model.request.loginRequest;
 import com.template.model.request.loginRequest;
 import com.template.model.result.CommonResult;
 import com.template.model.result.CommonResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
@@ -9,10 +9,8 @@ import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
-import javax.validation.Valid;
 
 
-
-@RequestMapping("/api/login")
+@RequestMapping("/auto/login")
 @Api(tags = {"LoginController"}, value = "登录")
 @Api(tags = {"LoginController"}, value = "登录")
 public interface LoginControllerAPI {
 public interface LoginControllerAPI {
 
 
@@ -23,5 +21,5 @@ public interface LoginControllerAPI {
 
 
     @PostMapping(value = "/ChangePassword")
     @PostMapping(value = "/ChangePassword")
     @ApiOperation(value = "修改密码", notes = "修改密码", httpMethod = "POST")
     @ApiOperation(value = "修改密码", notes = "修改密码", httpMethod = "POST")
-    CommonResult ChangePassword(@Validated @RequestBody com.repair.model.request.changePasswordRequest cpr, @RequestHeader("user_head") String userhead, BindingResult bindingResult);
+    CommonResult ChangePassword(@Validated @RequestBody changePasswordRequest cpr,  BindingResult bindingResult);
 }
 }

+ 0 - 34
src/main/java/com/template/api/RepairAdminControllerAPI.java

@@ -1,34 +0,0 @@
-package com.template.api;
-
-import com.template.model.pojo.RepairAdmin;
-import com.template.model.result.CommonResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-@RequestMapping("/api/repairAdmin")
-@Api(tags = {"RepairAdminController"}, value = "账号")
-public interface RepairAdminControllerAPI {
-
-    @PostMapping(value = "/insertRepairAdmin")
-    @ApiOperation(value = "添加账号", notes = "添加账号数据", httpMethod = "POST")
-    CommonResult InsertRepairAdmin(@Validated @RequestBody RepairAdmin repairAdmin, BindingResult bindingResult);
-
-    @GetMapping(value = "/queryPageRepairAdmins")
-    @ApiOperation(value = "账号分页数据", notes = "账号分页数据", httpMethod = "POST")
-    CommonResult queryPageRepairAdmins(@RequestParam int currentPage, @RequestParam int pageCount, String account, String phone, String userName);
-
-    @PostMapping(value = "/freezeRepairAdminById")
-    @ApiOperation(value = "根据ID冻结指定账号", notes = "根据ID冻结指定账户", httpMethod = "POST")
-    CommonResult freezeRepairAdminById(@Validated @RequestBody com.repair.model.request.freezeRepairAdminRequest frar, BindingResult bindingResult);
-
-    @GetMapping(value = "/deleteRepairAdminById")
-    @ApiOperation(value = "根据ID删除指定账号", notes = "根据ID删除指定账号", httpMethod = "POST")
-    CommonResult deleteRepairAdminById(@RequestParam String id);
-
-    @PostMapping(value = "/updateRepairAdminById")
-    @ApiOperation(value = "编辑账号数据", notes = "编辑账号数据", httpMethod = "POST")
-    CommonResult updateRepairAdminById(@Validated @RequestBody com.repair.model.request.updateRepairAdminRequest ra, @RequestHeader("user_head") String userhead, BindingResult bindingResult);
-}

+ 4 - 0
src/main/java/com/template/api/UsersMenuAPI.java

@@ -26,6 +26,10 @@ public interface UsersMenuAPI {
     @ApiOperation(value = "角色列表", notes = "角色列表", httpMethod = "GET")
     @ApiOperation(value = "角色列表", notes = "角色列表", httpMethod = "GET")
     CommonResult getUserRole();
     CommonResult getUserRole();
 
 
+    @GetMapping("/userListPage")
+    @ApiOperation(value = "用户角色分页列表", notes = "用户角色分页列表", httpMethod = "GET")
+    CommonResult userListPage(int adminMenuId,int page,int size,String keyWord,String startTime,String endTime);
+
 
 
 
 
 
 

+ 3 - 4
src/main/java/com/template/common/utils/JWTUtil.java

@@ -6,7 +6,6 @@ import com.auth0.jwt.JWTVerifier;
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.interfaces.Claim;
 import com.auth0.jwt.interfaces.Claim;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.auth0.jwt.interfaces.DecodedJWT;
-import com.template.model.pojo.RepairAdmin;
 import com.template.model.pojo.Admin;
 import com.template.model.pojo.Admin;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 
 
@@ -32,7 +31,7 @@ public class JWTUtil {
      * 生成token 有过期时间
      * 生成token 有过期时间
      * @return 返回token
      * @return 返回token
      */
      */
-    public static String getToken(RepairAdmin ra){
+    public static String getToken(Admin ra){
 
 
         // 签发时间
         // 签发时间
         Date iatDate = new Date();
         Date iatDate = new Date();
@@ -47,8 +46,8 @@ public class JWTUtil {
         map.put("typ", "JWT");
         map.put("typ", "JWT");
         String token = JWT.create()
         String token = JWT.create()
                 .withHeader(map) // header
                 .withHeader(map) // header
-                .withClaim("account", ra.getAccount()) // 账号
-                .withClaim("password", ra.getPassword()) // 密码
+                .withClaim("account", ra.getUserNumber()) // 账号
+                .withClaim("password", ra.getPassWord()) // 密码
                 .withExpiresAt(new Date(CommonUtil.getCurrentTimestamp() + EXPIRED)) // 设置过期时间。过期时间要大于签发时间
                 .withExpiresAt(new Date(CommonUtil.getCurrentTimestamp() + EXPIRED)) // 设置过期时间。过期时间要大于签发时间
                 .withIssuedAt(iatDate) // 设置签发时间
                 .withIssuedAt(iatDate) // 设置签发时间
                 .sign(Algorithm.HMAC256(SIGNATURE)); // 加密
                 .sign(Algorithm.HMAC256(SIGNATURE)); // 加密

File diff suppressed because it is too large
+ 15 - 11
src/main/java/com/template/common/utils/RSAUtils.java


+ 17 - 0
src/main/java/com/template/controller/AdminController.java

@@ -1,8 +1,10 @@
 package com.template.controller;
 package com.template.controller;
 
 
 
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.template.api.AdminAPI;
 import com.template.api.AdminAPI;
 import com.template.model.pojo.Admin;
 import com.template.model.pojo.Admin;
+import com.template.model.result.CommonResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
@@ -18,5 +20,20 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RestController
 public class AdminController implements AdminAPI {
 public class AdminController implements AdminAPI {
 
 
+    @Override
+    public CommonResult getListPage(int page, int size, String keyWord) {
+        if (ObjectUtils.isEmpty(page)&& page<=0) {
+            page=1;
+        }
+
+        if (ObjectUtils.isEmpty(size)&& size<=0) {
+            size=10;
+        }
+
+
+
+
+        return null;
+    }
 }
 }
 
 

+ 36 - 0
src/main/java/com/template/controller/AdminMenuController.java

@@ -3,13 +3,16 @@ package com.template.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.api.AdminMenuAPI;
 import com.template.api.AdminMenuAPI;
 import com.template.model.dto.SaveParentDto;
 import com.template.model.dto.SaveParentDto;
 import com.template.model.dto.SaveParentUserDto;
 import com.template.model.dto.SaveParentUserDto;
 import com.template.model.dto.SaveSecondaryDto;
 import com.template.model.dto.SaveSecondaryDto;
 import com.template.model.pojo.AdminMenu;
 import com.template.model.pojo.AdminMenu;
 import com.template.model.pojo.PermissionSetting;
 import com.template.model.pojo.PermissionSetting;
+import com.template.model.pojo.UsersMenu;
 import com.template.model.result.CommonResult;
 import com.template.model.result.CommonResult;
 import com.template.model.vo.AdminMenuTreeVo;
 import com.template.model.vo.AdminMenuTreeVo;
 import com.template.services.AdminMenuService;
 import com.template.services.AdminMenuService;
@@ -147,6 +150,39 @@ public class AdminMenuController implements AdminMenuAPI {
         return CommonResult.ok(adminMenuTreeVos);
         return CommonResult.ok(adminMenuTreeVos);
     }
     }
 
 
+    @Override
+    public CommonResult adminListPage(int adminMenuId,int page, int size, String keyWord, String startTime, String endTime) {
+
+        PermissionSetting permissionSetting = permissionSettingService.getById(adminMenuId);
+        if (ObjectUtils.isEmpty(permissionSetting)) {
+            return CommonResult.fail("非法进入");
+        }
+//      判断该用户是否拥有权限
+        String roleManagement = permissionSetting.getRoleManagement();
+        if (!"0".equals(roleManagement) && !roleManagement.contains("4")) {
+            return CommonResult.fail("此账号暂无该权限");
+        }
+
+
+        if (ObjectUtils.isEmpty(page) && page <= 0) {
+            page = 1;
+        }
+
+        if (ObjectUtils.isEmpty(size) && size <= 0) {
+            size = 10;
+        }
+
+
+        LambdaQueryWrapper<AdminMenu> wrapperAM = new LambdaQueryWrapper<>();
+        wrapperAM.like(ObjectUtils.isNotEmpty(keyWord), AdminMenu::getName, keyWord)
+                .between(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime), AdminMenu::getCreateTime, startTime, endTime);
+
+        IPage<AdminMenu> page1 = adminMenuService.page(new Page<>(page, size), wrapperAM);
+
+
+        return CommonResult.ok(page1);
+    }
+
     /**
     /**
      * 根据父类ID获取树形菜单数据
      * 根据父类ID获取树形菜单数据
      * @param parentID 父级ID
      * @param parentID 父级ID

+ 67 - 56
src/main/java/com/template/controller/LoginController.java

@@ -2,21 +2,20 @@ package com.template.controller;
 
 
 import com.template.annotation.PassToken;
 import com.template.annotation.PassToken;
 import com.template.api.LoginControllerAPI;
 import com.template.api.LoginControllerAPI;
+import com.template.common.utils.RSAUtils;
+import com.template.config.MySecurity;
 import com.template.model.enumModel.eStatu;
 import com.template.model.enumModel.eStatu;
 import com.template.model.pojo.Admin;
 import com.template.model.pojo.Admin;
-import com.template.model.pojo.RepairAdmin;
+import com.template.model.request.changePasswordRequest;
 import com.template.model.request.loginRequest;
 import com.template.model.request.loginRequest;
 import com.template.model.result.CommonResult;
 import com.template.model.result.CommonResult;
 import com.template.model.vo.LoginVO;
 import com.template.model.vo.LoginVO;
 import com.template.services.AdminService;
 import com.template.services.AdminService;
-import com.template.services.RepairAdminService;
-import com.template.common.utils.AesUtils;
 import com.template.common.utils.paramUtils;
 import com.template.common.utils.paramUtils;
 import com.template.common.utils.JWTUtil;
 import com.template.common.utils.JWTUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 /**
 /**
@@ -28,12 +27,14 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RestController
 public class LoginController implements LoginControllerAPI {
 public class LoginController implements LoginControllerAPI {
 
 
-    @Autowired
-    private RepairAdminService repairAdminService;
+
 
 
     @Autowired
     @Autowired
     private AdminService adminService;
     private AdminService adminService;
 
 
+    @Autowired
+    MySecurity mySecurity;
+
 
 
     /**
     /**
      * 登录接口
      * 登录接口
@@ -46,7 +47,7 @@ public class LoginController implements LoginControllerAPI {
     @Override
     @Override
     @PassToken
     @PassToken
     public CommonResult Login(@RequestBody loginRequest loginRequest, BindingResult bindingResult) {
     public CommonResult Login(@RequestBody loginRequest loginRequest, BindingResult bindingResult) {
-        if(loginRequest == null){
+       if(loginRequest == null){
             return CommonResult.fail("请传递参数");
             return CommonResult.fail("请传递参数");
         }
         }
         if (bindingResult.hasErrors()) {
         if (bindingResult.hasErrors()) {
@@ -59,33 +60,34 @@ public class LoginController implements LoginControllerAPI {
             return CommonResult.fail("账号或密码错误");
             return CommonResult.fail("账号或密码错误");
         }
         }
 
 
-        /*if(result.getStatu() == eStatu.Freeze.getValue()){
-            return CommonResult.fail("该账号已被冻结");
-        }*/
+        try {
+//           传入的解密
+            String decryptData = RSAUtils.decrypt(loginRequest.getPassword(),RSAUtils.getPrivateKey(mySecurity.privateKey));
+//            原密码解密
+            String decrypt = RSAUtils.decrypt(result.getPassWord(), RSAUtils.getPrivateKey(mySecurity.privateKey));
 
 
 
 
+            if(!decryptData.equals(decrypt)){
+                return CommonResult.fail("密码错误");
+            }
 
 
-/*        // 如果项目使用Aes加密,密码验证功能如下
-        String encPassword = AesUtils.encrypt(loginRequest.getPassword());
-        if(!encPassword.equals(result.getPassword())){
-            return CommonResult.fail("密码错误");
-        }*/
+            String token = JWTUtil.getAdminToken(result);
+            LoginVO login = new LoginVO();
+            login.setToken(token);
+            login.setTokenTtl(JWTUtil.getExpired());
+            login.setUserName(result.getName());
+            login.setId(result.getId());
+            login.setAdminMenuId(result.getAdminMenuId());
 
 
-        // 本项目使用RSA加密,前端将密码通过公钥进行加密,然后将密文传输到后端,因为数据库里存储的是密文,直接对比
-        // 密码验证功能如下
-        if(!loginRequest.getPassword().equals(result.getPassWord())){
+            return CommonResult.ok("登录成功",login);
+
+        }catch (Exception e){
+            e.printStackTrace();
             return CommonResult.fail("密码错误");
             return CommonResult.fail("密码错误");
         }
         }
 
 
-        String token = JWTUtil.getAdminToken(result);
-        LoginVO login = new LoginVO();
-        login.setToken(token);
-        login.setTokenTtl(JWTUtil.getExpired());
-        login.setUserName(result.getName());
-//        login.setUserhead(AesUtils.encrypt(result.getId()));
-        login.setId(result.getId());
 
 
-        return CommonResult.ok("登录成功",login);
+
     }
     }
 
 
     /**
     /**
@@ -94,57 +96,66 @@ public class LoginController implements LoginControllerAPI {
      * oldPassword 旧密码
      * oldPassword 旧密码
      * newPassword 新密码
      * newPassword 新密码
      * confirmPassword 确认密码
      * confirmPassword 确认密码
-     * @param userhead
      * @param bindingResult
      * @param bindingResult
      * @return
      * @return
      */
      */
     @Override
     @Override
-    public CommonResult ChangePassword(com.repair.model.request.changePasswordRequest cpr, @RequestHeader("user_head") String userhead, BindingResult bindingResult) {
+    public CommonResult ChangePassword(changePasswordRequest cpr,  BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
         if (bindingResult.hasErrors()) {
             String st = paramUtils.getParamError(bindingResult);
             String st = paramUtils.getParamError(bindingResult);
             return CommonResult.fail(st);
             return CommonResult.fail(st);
         }
         }
 
 
-        if(!cpr.getNewPassword().equals(cpr.getConfirmPassword())){
-            return CommonResult.fail("确认密码和新密码不一致!");
-        }
 
 
-        /*// 如果项目使用Aes加密,账号的解密如下
-        String userID = AesUtils.decrypt(userhead);
-        RepairAdmin operateData = repairAdminService.getRepairById(userID);*/
-
-        RepairAdmin operateData = repairAdminService.getRepairById(userhead);
-        if(operateData == null){
+        Admin admin = adminService.getById(cpr.getAdminId());
+        if(admin == null){
             return CommonResult.fail("当前账号不合法!");
             return CommonResult.fail("当前账号不合法!");
         }
         }
 
 
-        if(operateData.getStatu() == eStatu.Freeze.getValue()){
-            return CommonResult.fail("该账号已被冻结");
-        }
 
 
-/*        // 如果项目使用Aes加密,密码验证功能如下
-        if(!AesUtils.encrypt(cpr.getOldPassword()).equals(operateData.getPassword())){
-            return CommonResult.fail("原密码错误!");
-        }*/
+        try {
+//            新密码码解密
+            String newPassWord = RSAUtils.decrypt(cpr.getNewPassword(), RSAUtils.getPrivateKey(mySecurity.privateKey));
+//            确认密码解密
+            String confirmPassword = RSAUtils.decrypt(cpr.getConfirmPassword(), RSAUtils.getPrivateKey(mySecurity.privateKey));
 
 
-        // 本项目使用RSA加密,前端将密码通过公钥进行加密,然后将密文传输到后端,因为数据库里存储的是密文,直接对比
-        // 密码验证功能如下
-        if(!cpr.getOldPassword().equals(operateData.getPassword())){
-            return CommonResult.fail("原密码错误!");
+            if(!newPassWord.equals(confirmPassword)){
+                return CommonResult.fail("确认密码和新密码不一致!");
+            }
+
+//           传入的旧解密
+            String decryptData = RSAUtils.decrypt(cpr.getOldPassword(), RSAUtils.getPrivateKey(mySecurity.privateKey));
+
+            if (newPassWord.equals(decryptData)) {
+                return CommonResult.fail("新密码和旧密码一致!");
+            }
+
+//            原密码解密
+            String decrypt = RSAUtils.decrypt(admin.getPassWord(), RSAUtils.getPrivateKey(mySecurity.privateKey));
+
+            if (!decryptData.equals(decrypt)) {
+                return CommonResult.fail("原密码错误!");
+            }
+
+            admin.setPassWord(cpr.getNewPassword());
+
+            boolean update = adminService.updateById(admin);
+
+            if (update) {
+                return CommonResult.ok("修改成功");
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
         }
         }
 
 
-        RepairAdmin ra = new RepairAdmin();
+        return CommonResult.fail();
 
 
-        /*// 如果项目使用Aes加密,将账号密码保存进数据库如下
-        ra.setId(userID);
-        ra.setPassword(AesUtils.encrypt(cpr.getNewPassword()));*/
 
 
-        ra.setId(userhead);
-        ra.setPassword(cpr.getNewPassword());
 
 
-        int result = repairAdminService.updateRepairAdmin(ra);
 
 
-        return result > 0 ? CommonResult.ok("修改成功") : CommonResult.fail("修改失败");
 
 
     }
     }
+
+
 }
 }

+ 0 - 163
src/main/java/com/template/controller/RepairAdminController.java

@@ -1,163 +0,0 @@
-package com.template.controller;
-
-
-import com.template.api.RepairAdminControllerAPI;
-import com.template.common.utils.AesUtils;
-import com.template.common.utils.paramUtils;
-import com.template.model.enumModel.eIsSuper;
-import com.template.model.enumModel.eStatu;
-import com.template.model.pojo.RepairAdmin;
-import com.template.model.result.CommonResult;
-import com.template.model.result.PageUtils;
-import com.template.services.RepairAdminService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author ceshi
- * @since 2023-07-05
- */
-@RestController
-public class RepairAdminController implements RepairAdminControllerAPI {
-
-    @Autowired
-    private RepairAdminService repairAdminService;
-
-    /**
-     * 添加账号数据
-     *
-     * @param ra account 账号
-     *           password 密码
-     *           username 用户名称
-     *           phone 手机号
-     * @return
-     */
-    @Override
-    public CommonResult InsertRepairAdmin(@RequestBody RepairAdmin ra, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            String st = paramUtils.getParamError(bindingResult);
-            return CommonResult.fail(st);
-        }
-        int result = 0; // 帮我们自动生成id
-        try {
-            result = repairAdminService.insertRepairAdmin(ra);
-        } catch (Exception e) {
-            if (e.getCause().getMessage().contains("'repair_admin.account_un'")) {
-                return CommonResult.fail("该账号已存在!");
-            }
-            return CommonResult.fail("系统异常,添加失败!");
-        }
-        return result > 0 ? CommonResult.ok() : CommonResult.fail();
-    }
-
-    /**
-     * 查询账户列表数据
-     *
-     * @param currentPage 当前页
-     * @param pageCount   一页数据条数
-     * @param account     账号
-     * @param phone       手机号
-     * @param userName    账号名称
-     * @return
-     */
-    @Override
-    public CommonResult queryPageRepairAdmins(@RequestParam int currentPage, @RequestParam int pageCount, String account, String phone, String userName) {
-        PageUtils<RepairAdmin> result = repairAdminService.queryPageList(currentPage, pageCount, account, phone, userName);
-
-        return CommonResult.ok(result);
-    }
-
-    /**
-     * 根据ID冻结账号账号数据
-     *
-     * @param frar id 数据ID
-     *             statu 状态
-     *             正常:0;冻结:1
-     * @return
-     */
-    @Override
-    public CommonResult freezeRepairAdminById(@RequestBody com.repair.model.request.freezeRepairAdminRequest frar, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            String st = paramUtils.getParamError(bindingResult);
-            return CommonResult.fail(st);
-        }
-        RepairAdmin data = repairAdminService.getRepairById(frar.getId());
-        if (data == null) {
-            return CommonResult.fail("当前数据不存在,解冻失败!");
-        }
-        if (data.getStatu() == frar.getStatu()) {
-            String Message = frar.getStatu() == eStatu.Freeze.getValue() ? "当前处于冻结状态,请勿重复操作!" : "当前处于未冻结状态,请勿重复操作!";
-            return CommonResult.fail(Message);
-        }
-
-        String success = frar.getStatu() == eStatu.Freeze.getValue() ? "冻结成功!" : "解冻成功";
-        String fail = frar.getStatu() == eStatu.Freeze.getValue() ? "冻结失败!" : "解冻失败";
-        RepairAdmin ra = new RepairAdmin();
-        ra.setId(frar.getId());
-        ra.setStatu(frar.getStatu());
-        int result = repairAdminService.updateRepairAdmin(ra);
-        System.out.println(result);
-        return result > 0 ? CommonResult.ok(success) : CommonResult.fail(fail);
-    }
-
-    /**
-     * 根据ID删除账号数据
-     *
-     * @param id id 数据ID
-     * @return
-     */
-    @Override
-    public CommonResult deleteRepairAdminById(@RequestParam String id) {
-        RepairAdmin data = repairAdminService.getRepairById(id);
-        if (data == null) {
-            return CommonResult.fail("当前数据不存在,删除失败!");
-        }
-
-        int result = repairAdminService.deleteRepairAdminById(id);
-
-        return result > 0 ? CommonResult.ok() : CommonResult.fail();
-    }
-
-    /**
-     * 编辑账号
-     *
-     * @param ra id 数据ID
-     *           username 账号名称
-     *           phone 手机号
-     *           password 密码
-     * @return
-     */
-    @Override
-    public CommonResult updateRepairAdminById(com.repair.model.request.updateRepairAdminRequest ra, @RequestHeader("user_head") String userhead, BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            String st = paramUtils.getParamError(bindingResult);
-            return CommonResult.fail(st);
-        }
-
-        RepairAdmin data = repairAdminService.getRepairById(ra.getId());
-        if (data == null) {
-            return CommonResult.fail("当前数据不存在,编辑失败!");
-        }
-
-        //只有操作管理员才能编辑他人的密码
-        String userID = AesUtils.decrypt(userhead);
-        if (ra.getPassword() != null && !userID.equals(ra.getId())) {
-            RepairAdmin operateData = repairAdminService.getRepairById(userID);
-            if(operateData == null){
-                return CommonResult.fail("操作身份不合法,编辑失败!");
-            }
-            if(!data.getPassword().equals(AesUtils.encrypt(ra.getPassword())) && operateData.getIsSuper() != eIsSuper.Super.getValue()){
-                return CommonResult.fail("只有超级管理员才能更改密码!");
-            }
-        }
-
-        int result = repairAdminService.updateRepaiRadmin(ra);
-        return result > 0 ? CommonResult.ok("编辑成功") : CommonResult.fail("编辑失败");
-    }
-}
-

+ 44 - 8
src/main/java/com/template/controller/UsersMenuController.java

@@ -3,7 +3,9 @@ package com.template.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.api.UsersMenuAPI;
 import com.template.api.UsersMenuAPI;
 import com.template.model.dto.SaveParentDto;
 import com.template.model.dto.SaveParentDto;
 import com.template.model.dto.SaveParentUserDto;
 import com.template.model.dto.SaveParentUserDto;
@@ -26,7 +28,7 @@ import java.util.stream.Collectors;
 
 
 /**
 /**
  * <p>
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  * </p>
  *
  *
  * @author ceshi
  * @author ceshi
@@ -42,10 +44,11 @@ public class UsersMenuController implements UsersMenuAPI {
     PermissionSettingService permissionSettingService;
     PermissionSettingService permissionSettingService;
 
 
     public static void main(String[] args) {
     public static void main(String[] args) {
-        String s="1,2";
+        String s = "1,2";
         boolean contains = s.contains("3");
         boolean contains = s.contains("3");
         System.out.println("contains = " + contains);
         System.out.println("contains = " + contains);
     }
     }
+
     @Override
     @Override
     public CommonResult saveUserParent(SaveParentUserDto saveParentUserDto) {
     public CommonResult saveUserParent(SaveParentUserDto saveParentUserDto) {
         if (ObjectUtils.isEmpty(saveParentUserDto)) {
         if (ObjectUtils.isEmpty(saveParentUserDto)) {
@@ -64,8 +67,8 @@ public class UsersMenuController implements UsersMenuAPI {
         }
         }
 
 
         String name = saveParentUserDto.getName();
         String name = saveParentUserDto.getName();
-        LambdaQueryWrapper<UsersMenu> wrapperUm=new LambdaQueryWrapper<>();
-        wrapperUm.eq(UsersMenu::getName,name);
+        LambdaQueryWrapper<UsersMenu> wrapperUm = new LambdaQueryWrapper<>();
+        wrapperUm.eq(UsersMenu::getName, name);
         UsersMenu one = usersMenuService.getOne(wrapperUm);
         UsersMenu one = usersMenuService.getOne(wrapperUm);
         if (ObjectUtils.isNotEmpty(one)) {
         if (ObjectUtils.isNotEmpty(one)) {
             return CommonResult.fail("已有该角色");
             return CommonResult.fail("已有该角色");
@@ -97,8 +100,8 @@ public class UsersMenuController implements UsersMenuAPI {
 
 
 
 
         String name = saveSecondaryUserDto.getName();
         String name = saveSecondaryUserDto.getName();
-        LambdaQueryWrapper<UsersMenu> wrapperUm=new LambdaQueryWrapper<>();
-        wrapperUm.eq(UsersMenu::getName,name);
+        LambdaQueryWrapper<UsersMenu> wrapperUm = new LambdaQueryWrapper<>();
+        wrapperUm.eq(UsersMenu::getName, name);
         UsersMenu one = usersMenuService.getOne(wrapperUm);
         UsersMenu one = usersMenuService.getOne(wrapperUm);
         if (ObjectUtils.isNotEmpty(one)) {
         if (ObjectUtils.isNotEmpty(one)) {
             return CommonResult.fail("已有该角色");
             return CommonResult.fail("已有该角色");
@@ -112,18 +115,51 @@ public class UsersMenuController implements UsersMenuAPI {
 
 
     @Override
     @Override
     public CommonResult getUserRole() {
     public CommonResult getUserRole() {
-        Wrapper<UsersMenu> wrapper=new LambdaQueryWrapper<>();
+        Wrapper<UsersMenu> wrapper = new LambdaQueryWrapper<>();
         List<UsersMenu> adminMenus = usersMenuService.list(wrapper);
         List<UsersMenu> adminMenus = usersMenuService.list(wrapper);
         List<AdminMenuTreeVo> adminMenuTreeVos = QueryAreaTreeRecords(0, adminMenus);
         List<AdminMenuTreeVo> adminMenuTreeVos = QueryAreaTreeRecords(0, adminMenus);
 
 
         return CommonResult.ok(adminMenuTreeVos);
         return CommonResult.ok(adminMenuTreeVos);
     }
     }
 
 
+    @Override
+    public CommonResult userListPage(int adminMenuId,int page, int size, String keyWord, String startTime, String endTime) {
+        PermissionSetting permissionSetting = permissionSettingService.getById(adminMenuId);
+        if (ObjectUtils.isEmpty(permissionSetting)) {
+            return CommonResult.fail("非法进入");
+        }
+//      判断该用户是否拥有权限
+        String roleManagement = permissionSetting.getRoleManagement();
+        if (!"0".equals(roleManagement) && !roleManagement.contains("4")) {
+            return CommonResult.fail("此账号暂无该权限");
+        }
+
+
+        if (ObjectUtils.isEmpty(page) && page <= 0) {
+            page = 1;
+        }
+
+        if (ObjectUtils.isEmpty(size) && size <= 0) {
+            size = 10;
+        }
+
+
+        LambdaQueryWrapper<UsersMenu> wrapperUM = new LambdaQueryWrapper<>();
+        wrapperUM.like(ObjectUtils.isNotEmpty(keyWord), UsersMenu::getName, keyWord)
+                .between(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime), UsersMenu::getCreateTime, startTime, endTime);
+
+        IPage<UsersMenu> page1 = usersMenuService.page(new Page<>(page, size), wrapperUM);
+
+
+        return CommonResult.ok(page1);
+    }
+
 
 
     /**
     /**
      * 根据父类ID获取树形菜单数据
      * 根据父类ID获取树形菜单数据
+     *
      * @param parentID 父级ID
      * @param parentID 父级ID
-     * @param lists 数据集合
+     * @param lists    数据集合
      * @return
      * @return
      */
      */
     private List<AdminMenuTreeVo> QueryAreaTreeRecords(Integer parentID, List<UsersMenu> lists) {
     private List<AdminMenuTreeVo> QueryAreaTreeRecords(Integer parentID, List<UsersMenu> lists) {

+ 0 - 17
src/main/java/com/template/mapper/RepairAdminMapper.java

@@ -1,17 +0,0 @@
-package com.template.mapper;
-
-import com.template.model.pojo.RepairAdmin;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
-
-/*
-Mapper和Repository的相同点:
-@Mapper和@Repository都是作用在dao层接口,使得其生成代理对象bean,交给spring 容器管理,对于mybatis来说,都可以不用写mapper.xml文件
-Mapper和Repository的区别:
-@Repository需要在Spring中配置扫描地址,然后生成Dao层的Bean才能被注入到Service层中:如下,在启动类中配置扫描地址:
-@Mapper不需要配置扫描地址,通过xml里面的namespace里面的接口地址,生成了Bean后注入到Service层中
-* */
-@Repository
-public interface RepairAdminMapper extends BaseMapper<RepairAdmin> {
-
-}

+ 0 - 3
src/main/java/com/template/model/pojo/Admin.java

@@ -31,9 +31,6 @@ public class Admin implements Serializable {
     @ApiModelProperty(value = "管理菜单表的id")
     @ApiModelProperty(value = "管理菜单表的id")
     private String adminMenuId;
     private String adminMenuId;
 
 
-    @ApiModelProperty(value = "角色")
-    private String role;
-
 
 
     @ApiModelProperty(value = "账号")
     @ApiModelProperty(value = "账号")
     private String userNumber;
     private String userNumber;

+ 0 - 81
src/main/java/com/template/model/pojo/RepairAdmin.java

@@ -1,81 +0,0 @@
-package com.template.model.pojo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ceshi
- * @since 2023-07-05
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="RepairAdmin对象", description="")
-public class RepairAdmin implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id", type = IdType.UUID)
-    private String id;
-
-    @ApiModelProperty(value = "账号")
-    @NotBlank(message = "账号不能为空")
-    private String account;
-
-    @ApiModelProperty(value = "密码")
-    @NotBlank(message = "密码不能为空")
-    private String password;
-
-    @ApiModelProperty(value = "昵称")
-    @NotBlank(message = "昵称不能为空")
-    private String username;
-
-    @ApiModelProperty(value = "手机号")
-    @NotBlank(message = "手机号不能为空")
-    private String phone;
-
-    @ApiModelProperty(value = "是否是超级管理员 正常:0;超级管理员:1")
-    private Integer isSuper;
-
-    @ApiModelProperty(value = "状态 正常:0;冻结:1")
-    private Integer statu;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-
-    @ApiModelProperty(value = "创建人员")
-    @TableField(fill = FieldFill.INSERT)
-    private String createUser;
-
-    @ApiModelProperty(value = "更新人员")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateUser;
-
-    @ApiModelProperty(value = "逻辑删除 未删除:0;删除:1")
-    @TableLogic
-    @TableField(fill = FieldFill.INSERT)
-    private Integer deleted;
-
-}

+ 2 - 2
src/main/java/com/template/model/pojo/Users.java

@@ -60,11 +60,11 @@ public class Users implements Serializable {
 
 
     @ApiModelProperty(value = "创建时间")
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
+    private String createTime;
 
 
     @ApiModelProperty(value = "更新时间")
     @ApiModelProperty(value = "更新时间")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
+    private String updateTime;
 
 
     @ApiModelProperty(value = "创建人员")
     @ApiModelProperty(value = "创建人员")
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

+ 4 - 1
src/main/java/com/template/model/request/changePasswordRequest.java

@@ -1,4 +1,4 @@
-package com.repair.model.request;
+package com.template.model.request;
 
 
 import lombok.Data;
 import lombok.Data;
 
 
@@ -26,4 +26,7 @@ public class changePasswordRequest {
      */
      */
     @NotBlank(message = "确认密码不能为空")
     @NotBlank(message = "确认密码不能为空")
     private String confirmPassword;
     private String confirmPassword;
+
+
+    private String adminId;
 }
 }

+ 3 - 4
src/main/java/com/template/model/vo/LoginVO.java

@@ -16,10 +16,7 @@ public class LoginVO {
      * 用户姓名
      * 用户姓名
      */
      */
     private String userName;
     private String userName;
-    /**
-     * 加密后的用户ID
-     */
-    private String userhead;
+
 
 
     /**
     /**
      * 新增,没加密,用户ID
      * 新增,没加密,用户ID
@@ -35,4 +32,6 @@ public class LoginVO {
      */
      */
     private long tokenTtl;
     private long tokenTtl;
 
 
+    private String adminMenuId;
+
 }
 }

+ 0 - 31
src/main/java/com/template/services/RepairAdminService.java

@@ -1,31 +0,0 @@
-package com.template.services;
-
-import com.template.model.pojo.RepairAdmin;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.template.model.result.CommonResult;
-import com.template.model.result.PageUtils;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author ceshi
- * @since 2023-07-05
- */
-public interface RepairAdminService extends IService<RepairAdmin> {
-    int insertRepairAdmin(RepairAdmin ra);
-
-    int deleteRepairAdminById(String id);
-
-    RepairAdmin getRepairByAccount(String Account);
-
-    PageUtils<RepairAdmin> queryPageList(int currentPage, int pageCount, String account, String phone, String userName);
-
-    RepairAdmin getRepairById(String id);
-
-    int updateRepaiRadmin(com.repair.model.request.updateRepairAdminRequest urar);
-
-    int updateRepairAdmin(RepairAdmin ra);
-}

+ 0 - 5
src/main/java/com/template/services/impl/AdminServiceImpl.java

@@ -6,11 +6,6 @@ import com.template.mapper.AdminMapper;
 import com.template.services.AdminService;
 import com.template.services.AdminService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.template.mapper.AdminMapper;
-import com.template.model.pojo.Admin;
-import com.template.model.pojo.RepairAdmin;
-import com.template.services.AdminService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 

+ 0 - 90
src/main/java/com/template/services/impl/RepairAdminServiceImpl.java

@@ -1,90 +0,0 @@
-package com.template.services.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.template.common.utils.AesUtils;
-import com.template.model.pojo.RepairAdmin;
-import com.template.mapper.RepairAdminMapper;
-import com.template.model.result.PageUtils;
-import com.template.services.RepairAdminService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author ceshi
- * @since 2023-07-05
- */
-@Service
-public class RepairAdminServiceImpl extends ServiceImpl<RepairAdminMapper, RepairAdmin> implements RepairAdminService {
-
-    @Autowired
-    private RepairAdminMapper repairAdminMapper ;
-
-    @Override
-    public int insertRepairAdmin(RepairAdmin ra) {
-        ra.setIsSuper(0);
-        ra.setStatu(0);
-        ra.setPassword(AesUtils.encrypt(ra.getPassword()));//加密密码
-        int result = repairAdminMapper.insert(ra);
-        return result;
-    }
-
-    @Override
-    public int deleteRepairAdminById(String id) {
-        int result = repairAdminMapper.deleteById(id);
-        return result;
-    }
-
-    @Override
-    public RepairAdmin getRepairByAccount(String Account) {
-        QueryWrapper<RepairAdmin> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("account", Account);
-        RepairAdmin result = repairAdminMapper.selectOne(queryWrapper);
-        return result;
-    }
-
-    @Override
-    public RepairAdmin getRepairById(String id) {
-        RepairAdmin result = repairAdminMapper.selectById(id);
-        return result;
-    }
-
-    @Override
-    public int updateRepaiRadmin(com.repair.model.request.updateRepairAdminRequest urar) {
-        //只更改有值的字段
-        RepairAdmin ra = new RepairAdmin();
-        ra.setId(urar.getId());
-        //超级管理员用户才能更改密码
-        if(urar.getPassword() != null){
-            urar.setPassword(AesUtils.encrypt(urar.getPassword()));//加密密码
-        }
-        ra.setUsername(urar.getUsername());
-        ra.setPhone(urar.getPhone());
-        int result = repairAdminMapper.updateById(ra);
-        return result;
-    }
-
-    @Override
-    public int updateRepairAdmin(RepairAdmin ra) {
-        int result = repairAdminMapper.updateById(ra);
-        return result;
-    }
-
-    @Override
-    public PageUtils<RepairAdmin> queryPageList(int currentPage, int pageCount, String account, String phone, String userName) {
-        Page<RepairAdmin> page = new Page<>(currentPage, pageCount);
-        QueryWrapper<RepairAdmin> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StringUtils.hasText(account), "account", account);
-        queryWrapper.like(StringUtils.hasText(phone), "phone", phone);
-        queryWrapper.like(StringUtils.hasText(userName), "username", userName);
-        IPage<RepairAdmin> result = repairAdminMapper.selectPage(page, queryWrapper);
-        return new PageUtils(result);
-    }
-}

+ 0 - 5
src/main/resources/mapper/template/RepairAdminMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.template.mapper.RepairAdminMapper">
-
-</mapper>

BIN
target/classes/com/repair/model/request/changePasswordRequest.class


BIN
target/classes/com/template/api/AdminAPI.class


BIN
target/classes/com/template/api/AdminMenuAPI.class


BIN
target/classes/com/template/api/LoginControllerAPI.class


BIN
target/classes/com/template/api/RepairAdminControllerAPI.class


BIN
target/classes/com/template/api/UsersMenuAPI.class


BIN
target/classes/com/template/common/utils/JWTUtil.class


BIN
target/classes/com/template/common/utils/RSAUtils.class


BIN
target/classes/com/template/controller/AdminController.class


BIN
target/classes/com/template/controller/AdminMenuController.class


BIN
target/classes/com/template/controller/LoginController.class


BIN
target/classes/com/template/controller/RepairAdminController.class


BIN
target/classes/com/template/controller/UsersController.class


BIN
target/classes/com/template/controller/UsersMenuController.class


BIN
target/classes/com/template/mapper/RepairAdminMapper.class


BIN
target/classes/com/template/model/pojo/Admin.class


BIN
target/classes/com/template/model/pojo/RepairAdmin.class


BIN
target/classes/com/template/model/pojo/Users.class


BIN
target/classes/com/template/model/request/changePasswordRequest.class


BIN
target/classes/com/template/model/vo/LoginVO.class


BIN
target/classes/com/template/services/RepairAdminService.class


BIN
target/classes/com/template/services/impl/AdminServiceImpl.class


BIN
target/classes/com/template/services/impl/RepairAdminServiceImpl.class


+ 0 - 5
target/classes/mapper/template/RepairAdminMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.template.mapper.RepairAdminMapper">
-
-</mapper>