权限部分，要改

.idea/compiler.xml

@@ -3,6 +3,17 @@
   <component name="CompilerConfiguration">
     <annotationProcessing>
       <profile default="true" name="Default" enabled="true" />
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="iHotel_student_houtai" />
+      </profile>
     </annotationProcessing>
   </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="iHotel_student_houtai" options="-parameters" />
+    </option>
+  </component>
 </project>

.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+  </component>
+</project>

.idea/workspace.xml

@@ -5,140 +5,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="42a0d34b-c484-4704-92dd-be5ac61d2f66" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/PermissionSettingAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/ExcelUtils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/weixin/DictionaryCompare.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/weixin/EndPay.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/weixin/JaxbUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/weixin/PayWxUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/weixin/TongYiReturn.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/CancelDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/CheckIdCardDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/CheckOutDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/CleanRoomDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/DirtyRoomDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/EstablishOrderDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/MaintainDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/ReserveDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/RoomChangeDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/LockRoomDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseOrderPageListVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseStustaVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/PriceVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ReserveDayVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/AccessToken.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/CodeEntity.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/CodeEntityVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/Ordering.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/Pay.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/PayResult.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/Users.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/WechatResult.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/WechatUnifiedOrder.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/Wechat_userinfo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/WeiXinUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/Wx_user.java" 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/AutoCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/AutoCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/HouseNumberStateAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/HouseNumberStateAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/HouseOrderAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/HouseOrderAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/HousePriceAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/HousePriceAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/common/utils/MD5.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/MD5.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/config/DoorLockConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/config/DoorLockConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/config/WeixiaoConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/config/WeixiaoConfig.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/HouseStateController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/PasswordIssController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/PasswordIssController.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/mapper/HouseLockMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseLockMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseNumberStateMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseNumberStateMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseOrderMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseOrderMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/HousePriceMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/HousePriceMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseStateMapper.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/dto/CardInfoDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/CardInfoDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/dto/EstablishOrder.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/dto/FingerprintDataDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/FingerprintDataDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/dto/PasswordDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/PasswordDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/PasswordUrlEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/PasswordUrlEnum.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/HouseNumber.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/HouseNumber.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/HouseNumberState.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/HouseNumberState.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/HouseOrder.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/HouseState.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/CalendarPageVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/CalendarPageVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseNumberStateDateVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseNumberStateDateVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseNumberStatePageVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseNumberStatePageVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseStateVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseStateVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/HouseLockService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/HouseLockService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/HouseNumberStateService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/HouseNumberStateService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/HouseOrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/HouseOrderService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/HousePriceService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/HousePriceService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/HouseStateService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseLockServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseLockServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseNumberStateServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseNumberStateServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseOrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseOrderServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HousePriceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HousePriceServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseStateServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseLockMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseLockMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseNumberMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseNumberMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseNumberStateMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseNumberStateMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseOrderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseOrderMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/HousePriceMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/HousePriceMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseStateMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" 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/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/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/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/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/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/HouseStateController.class" beforeDir="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/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/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/mapper/HouseStateMapper.class" beforeDir="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/EstablishOrder.class" beforeDir="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/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/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/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/HouseState.class" beforeDir="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/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/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/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/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/HouseStateService.class" beforeDir="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/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/HouseStateServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HouseLockMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/template/HouseLockMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HouseNumberMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/template/HouseNumberMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HouseNumberStateMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/template/HouseNumberStateMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HouseOrderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/template/HouseOrderMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HousePriceMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/template/HousePriceMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HouseStateMapper.xml" beforeDir="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/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.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$/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/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" />
+      <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/resources/mapper/template/PermissionSettingMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/PermissionSettingMapper.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -148,8 +19,8 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="Class" />
         <option value="Interface" />
+        <option value="Class" />
       </list>
     </option>
   </component>
@@ -162,8 +33,8 @@
   <component name="MavenImportPreferences">
     <option name="generalSettings">
       <MavenGeneralSettings>
-        <option name="mavenHome" value="D:/soft/maven/apache-maven-3.8.6" />
-        <option name="userSettingsFile" value="D:\soft\maven\apache-maven-3.8.6\conf\settings.xml" />
+        <option name="mavenHome" value="D:/software1/apache-maven-3.6.0" />
+        <option name="userSettingsFile" value="D:\software1\apache-maven-3.6.0\conf\settings.xml" />
       </MavenGeneralSettings>
     </option>
   </component>
@@ -175,44 +46,39 @@
   </component>
   <component name="ProjectId" id="2YHd6TDRlyqYh3OC9nI7fVxdhno" />
   <component name="ProjectViewState">
-    <option name="showExcludedFiles" value="false" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RequestMappingsPanelOrder0": "0",
-    "RequestMappingsPanelOrder1": "1",
-    "RequestMappingsPanelWidth0": "75",
-    "RequestMappingsPanelWidth1": "75",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "last_opened_file_path": "E:/company/backend_code",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "project.structure.last.edited": "Project",
-    "project.structure.proportion": "0.15",
-    "project.structure.side.proportion": "0.0",
-    "settings.editor.selected.configurable": "MavenSettings",
-    "spring.configuration.checksum": "f6966ce39847c3d9a18b4a1dfc3fec06"
-  }
-}]]></component>
+  <component name="PropertiesComponent">
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/java/com/template/model/result" />
+    <property name="node.js.detected.package.eslint" value="true" />
+    <property name="node.js.detected.package.tslint" value="true" />
+    <property name="node.js.path.for.package.eslint" value="project" />
+    <property name="node.js.path.for.package.tslint" value="project" />
+    <property name="node.js.selected.package.eslint" value="(autodetect)" />
+    <property name="node.js.selected.package.tslint" value="(autodetect)" />
+    <property name="project.structure.last.edited" value="Project" />
+    <property name="project.structure.proportion" value="0.0" />
+    <property name="project.structure.side.proportion" value="0.0" />
+    <property name="settings.editor.selected.configurable" value="MavenSettings" />
+  </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="E:\company\iHotel_student_houtai\src\main\java\com\template\common\utils" />
-      <recent name="E:\company\iHotel_student_houtai\src\main\java\com\template\model\weixin" />
-    </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="E:\company\iHotel_student_houtai\src\main\resources\mapper\template" />
-      <recent name="E:\company\iHotel_student_houtai\src\main\resources\mapper" />
+      <recent name="D:\code\iHotel_student_houtai\iHotel_student_houtai\src\main\java\com\template\model\result" />
+      <recent name="D:\code\iHotel_student_houtai\iHotel_student_houtai\src\main\java\com\template\common\annotation" />
+      <recent name="D:\code\iHotel_student_houtai\iHotel_student_houtai\src\main\java\com\template\model\vo" />
+      <recent name="D:\code\iHotel_student_houtai\iHotel_student_houtai\src\main\resources\mapper\template" />
+      <recent name="D:\code\iHotel_student_houtai\iHotel_student_houtai\src\main\java\com\template\services\impl" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="com.template.common.utils" />
       <recent name="com.template.model.weixin" />
     </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="E:\company\iHotel_student_houtai\src\main\resources\mapper\template" />
+      <recent name="E:\company\iHotel_student_houtai\src\main\resources\mapper" />
+    </key>
   </component>
   <component name="RunDashboard">
     <option name="configurationTypes">
@@ -223,24 +89,27 @@
   </component>
   <component name="RunManager">
     <configuration name="MybatisPlusApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
-      <option name="ACTIVE_PROFILES" />
       <module name="iHotel_student_houtai" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.template.MybatisPlusApplication" />
       <extension name="coverage">
         <pattern>
           <option name="PATTERN" value="com.template.*" />
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.template.MybatisPlusApplication" />
+      <option name="ACTIVE_PROFILES" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
   </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="SpellCheckerSettings" BundledDictionaries="0" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="application-level" UseSingleDictionary="true" />
   <component name="SshConsoleOptionsProvider">
     <option name="myEncoding" value="UTF-8" />
   </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
       <changelist id="42a0d34b-c484-4704-92dd-be5ac61d2f66" name="Changes" comment="" />
@@ -251,37 +120,45 @@
       <workItem from="1700186265128" duration="1452000" />
       <workItem from="1700187845025" duration="272442000" />
       <workItem from="1701824578863" duration="58559000" />
+      <workItem from="1702026186043" duration="2049000" />
+      <workItem from="1702259959357" duration="3737000" />
     </task>
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
+    <option name="version" value="1" />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
       <map>
         <entry key="MAIN">
           <value>
-            <State />
+            <State>
+              <option name="COLUMN_ORDER" />
+            </State>
           </value>
         </entry>
       </map>
     </option>
   </component>
+  <component name="WindowStateProjectService">
+    <state x="526" y="113" key="FileChooserDialogImpl" timestamp="1702026241344">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="526" y="113" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1702026241344" />
+    <state x="249" y="0" key="SettingsEditor" timestamp="1702026245320">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="249" y="0" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1702026245320" />
+    <state x="461" y="241" key="com.intellij.ide.util.TipDialog" timestamp="1702259969959">
+      <screen x="0" y="0" width="1536" height="824" />
+    </state>
+    <state x="461" y="241" key="com.intellij.ide.util.TipDialog/0.0.1536.824@0.0.1536.824" timestamp="1702259969959" />
+  </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/ClassScheduleController.java</url>
-          <line>98</line>
-          <option name="timeStamp" value="15" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/ClassScheduleController.java</url>
-          <line>124</line>
-          <option name="timeStamp" value="16" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java</url>
           <line>162</line>
           <option name="timeStamp" value="31" />
@@ -318,7 +195,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/PasswordIssController.java</url>
-          <line>110</line>
+          <line>117</line>
           <option name="timeStamp" value="55" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">

src/main/java/com/template/common/annotation/Generator.java

@@ -0,0 +1,15 @@
+package com.template.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 自动生成代码注解
+ */
+@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD})
+@Retention(RetentionPolicy.SOURCE)
+public @interface Generator {
+    String value() default "自动生成代码";
+}

src/main/java/com/template/common/annotation/IgnorePermissionsCheck.java

@@ -0,0 +1,14 @@
+package com.template.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 请求接口忽略权限验证注解
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface IgnorePermissionsCheck {
+}

src/main/java/com/template/common/utils/JWTUtil.java

@@ -7,6 +7,7 @@ import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.interfaces.Claim;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.template.model.pojo.RepairAdmin;
+import com.template.model.pojo.Admin;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Date;
@@ -64,6 +65,44 @@ public class JWTUtil {
 //        return builder.sign(Algorithm.HMAC256(SIGNATURE)).toString();
     }
 
+    /**
+     * 生成token 有过期时间
+     * @return 返回token
+     */
+    public static String getAdminToken(Admin ra){
+
+        // 签发时间
+        Date iatDate = new Date();
+
+//        // 过期时间
+//        Calendar nowTime = Calendar.getInstance();
+//        nowTime.add(Calendar.DAY_OF_WEEK, 3);
+//        Date expiresDate = nowTime.getTime();
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("alg", "HMAC256");
+        map.put("typ", "JWT");
+        String token = JWT.create()
+                .withHeader(map) // header
+                .withClaim("account", ra.getUserNumber()) // 账号
+                .withClaim("password", ra.getPassWord()) // 密码
+                .withExpiresAt(new Date(CommonUtil.getCurrentTimestamp() + EXPIRED)) // 设置过期时间。过期时间要大于签发时间
+                .withIssuedAt(iatDate) // 设置签发时间
+                .sign(Algorithm.HMAC256(SIGNATURE)); // 加密
+        return token;
+
+//
+//        JWTCreator.Builder builder = JWT.create();
+//        map.forEach((k,v)->{
+//            builder.withClaim(k,v);
+//        });
+//        Calendar instance = Calendar.getInstance();
+//        instance.add(Calendar.SECOND,7);
+//        builder.withExpiresAt(instance.getTime());
+//        return builder.sign(Algorithm.HMAC256(SIGNATURE)).toString();
+    }
+
+
     public static long getExpired() {
         return EXPIRED;
     }

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

@@ -3,10 +3,12 @@ package com.template.controller;
 import com.template.annotation.PassToken;
 import com.template.api.LoginControllerAPI;
 import com.template.model.enumModel.eStatu;
+import com.template.model.pojo.Admin;
 import com.template.model.pojo.RepairAdmin;
 import com.template.model.request.loginRequest;
 import com.template.model.result.CommonResult;
 import com.template.model.vo.LoginVO;
+import com.template.services.AdminService;
 import com.template.services.RepairAdminService;
 import com.template.common.utils.AesUtils;
 import com.template.common.utils.paramUtils;
@@ -29,8 +31,8 @@ public class LoginController implements LoginControllerAPI {
     @Autowired
     private RepairAdminService repairAdminService;
 
-
-
+    @Autowired
+    private AdminService adminService;
 
 
     /**
@@ -52,26 +54,36 @@ public class LoginController implements LoginControllerAPI {
             return CommonResult.fail(st);
         }
 
-        RepairAdmin result = repairAdminService.getRepairByAccount(loginRequest.getAccount());
+        Admin result = adminService.getAdminByAccount(loginRequest.getAccount());
         if(result == null){
             return CommonResult.fail("账号或密码错误");
         }
 
-        if(result.getStatu() == eStatu.Freeze.getValue()){
+        /*if(result.getStatu() == eStatu.Freeze.getValue()){
             return CommonResult.fail("该账号已被冻结");
-        }
+        }*/
 
+
+
+/*        // 如果项目使用Aes加密，密码验证功能如下
         String encPassword = AesUtils.encrypt(loginRequest.getPassword());
         if(!encPassword.equals(result.getPassword())){
             return CommonResult.fail("密码错误");
+        }*/
+
+        // 本项目使用RSA加密，前端将密码通过公钥进行加密，然后将密文传输到后端，因为数据库里存储的是密文，直接对比
+        // 密码验证功能如下
+        if(!loginRequest.getPassword().equals(result.getPassWord())){
+            return CommonResult.fail("密码错误");
         }
 
-        String token = JWTUtil.getToken(result);
+        String token = JWTUtil.getAdminToken(result);
         LoginVO login = new LoginVO();
         login.setToken(token);
         login.setTokenTtl(JWTUtil.getExpired());
-        login.setUserName(result.getUsername());
-        login.setUserhead(AesUtils.encrypt(result.getId()));
+        login.setUserName(result.getName());
+//        login.setUserhead(AesUtils.encrypt(result.getId()));
+        login.setId(result.getId());
 
         return CommonResult.ok("登录成功",login);
     }
@@ -97,8 +109,11 @@ public class LoginController implements LoginControllerAPI {
             return CommonResult.fail("确认密码和新密码不一致！");
         }
 
+        /*// 如果项目使用Aes加密，账号的解密如下
         String userID = AesUtils.decrypt(userhead);
-        RepairAdmin operateData = repairAdminService.getRepairById(userID);
+        RepairAdmin operateData = repairAdminService.getRepairById(userID);*/
+
+        RepairAdmin operateData = repairAdminService.getRepairById(userhead);
         if(operateData == null){
             return CommonResult.fail("当前账号不合法！");
         }
@@ -107,15 +122,29 @@ public class LoginController implements LoginControllerAPI {
             return CommonResult.fail("该账号已被冻结");
         }
 
+/*        // 如果项目使用Aes加密，密码验证功能如下
         if(!AesUtils.encrypt(cpr.getOldPassword()).equals(operateData.getPassword())){
             return CommonResult.fail("原密码错误！");
+        }*/
+
+        // 本项目使用RSA加密，前端将密码通过公钥进行加密，然后将密文传输到后端，因为数据库里存储的是密文，直接对比
+        // 密码验证功能如下
+        if(!cpr.getOldPassword().equals(operateData.getPassword())){
+            return CommonResult.fail("原密码错误！");
         }
 
         RepairAdmin ra = new RepairAdmin();
+
+        /*// 如果项目使用Aes加密，将账号密码保存进数据库如下
         ra.setId(userID);
-        ra.setPassword(AesUtils.encrypt(cpr.getNewPassword()));
+        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("修改失败");
+
     }
 }

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

@@ -1,21 +1,140 @@
+/*
 package com.template.controller;
 
+*/
+/*import com.template.bo.system.PermissionsABO;
+import com.template.bo.system.PermissionsEBO;
+import com.template.bo.system.PermissionsQBO;
+import com.template.service.system.PermissionsService;
+import com.template.vo.system.PermissionsDetailVO;
+import com.template.vo.system.PermissionsTreeVO;
+import com.template.vo.system.PermissionsVO;
+import com.common.annotation.Generator;
+import com.common.annotation.IgnorePermissionsCheck;
+import com.common.entity.Result;
+import com.github.pagehelper.PageSerializable;*//*
 
-import com.template.api.PermissionSettingAPI;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.template.common.annotation.Generator;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation .*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+import java.util.Set;
 
+
+public class PermissionSettingController {
+
+    */
 /**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author ceshi
- * @since 2023-11-15
- */
-@RestController
-public class PermissionSettingController implements PermissionSettingAPI {
+     * 权限接口
+     *//*
 
-}
+    @Validated
+    @RestController
+    @RequiredArgsConstructor
+    @RequestMapping("/api/system/permissions")
+    @Api(value = "权限接口", tags = {"权限管理"}, hidden = false)
+    public class PermissionsController {
+
+        @Generator
+        private final PermissionsService permissionsService;
+
+        */
+/**
+         * 新增权限
+         *//*
+
+        @ApiOperation(value = "新增权限", hidden = true)
+        @PostMapping("/add")
+        @ApiImplicitParam(name = "Authorization", value = "token", required = true, dataType = "String", paramType = "header")
+        public Result<Boolean> add(@RequestBody @Validated PermissionsABO bo) {
+            return Result.ok(permissionsService.add(bo));
+        }
+
+        */
+/**
+         * 删除权限
+         *//*
+
+        @ApiOperation(value = "删除权限", hidden = true)
+        @DeleteMapping("/delete")
+        @ApiImplicitParam(name = "Authorization", value = "token", required = true, dataType = "String", paramType = "header")
+        public Result<Boolean> delete(@NotEmpty(message = "ids不能为空") @RequestParam Long[] ids) {
+            return Result.ok(permissionsService.deleteByIds(ids));
+        }
+
+        */
+/**
+         * 修改权限
+         *//*
+
+        @ApiOperation(value = "修改权限", hidden = true)
+        @PutMapping("/update")
+        @ApiImplicitParam(name = "Authorization", value = "token", required = true, dataType = "String", paramType = "header")
+        public Result<Boolean> update(@RequestBody @Validated PermissionsEBO bo) {
+            return Result.ok(permissionsService.update(bo));
+        }
 
+        */
+/**
+         * 获取权限详细信息
+         *//*
+
+        @ApiOperation(value = "获取权限详细信息", hidden = true)
+        @GetMapping("/detail/{id}")
+        @ApiImplicitParam(name = "Authorization", value = "token", required = true, dataType = "String", paramType = "header")
+        public Result<PermissionsDetailVO> detail(@NotNull(message = "id不能为空") @PathVariable("id") Long id) {
+            return Result.ok(permissionsService.queryById(id));
+        }
+
+        */
+/**
+         * 分页查询权限列表
+         *//*
+
+        @ApiOperation(value = "查询权限列表", hidden = true)
+        @GetMapping("/list")
+        @ApiImplicitParam(name = "Authorization", value = "token", required = true, dataType = "String", paramType = "header")
+        public Result<PageSerializable<PermissionsVO>> list(@Validated PermissionsQBO bo) {
+            return Result.ok(permissionsService.queryPageList(bo));
+        }
+
+        */
+/**
+         * 获取权限树
+         *//*
+
+        @IgnorePermissionsCheck
+        @ApiOperation("获取权限树")
+        @GetMapping("/tree")
+        @Cacheable(value = "permissions_tree")
+        @ApiImplicitParam(name = "Authorization", value = "token", required = true, dataType = "String", paramType = "header")
+        public Result<List<PermissionsTreeVO>> tree() {
+            return Result.ok(permissionsService.tree());
+        }
+
+        */
+/**
+         * 启用权限
+         *//*
+
+        @ApiOperation("启用权限")
+        @PutMapping("/enable")
+        @CacheEvict(value = "permissions_tree", allEntries = true)
+        @ApiImplicitParams({@ApiImplicitParam(name = "ids", value = "启用的权限ID数组", required = true, allowMultiple = true, dataType = "long")})
+        @ApiImplicitParam(name = "Authorization", value = "token", required = true, dataType = "String", paramType = "header")
+        public Result<Boolean> enable(@RequestBody @Validated @NotNull Set<Long> ids) {
+            return Result.ok(permissionsService.updateEnable(ids));
+        }
+    }
+}
+*/

src/main/java/com/template/mapper/AdminMapper.java

@@ -0,0 +1,18 @@
+package com.template.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.template.model.pojo.Admin;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wxx
+ * @since 2023-11-16
+ */
+@Repository
+public interface AdminMapper extends BaseMapper<Admin> {
+
+}

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

@@ -0,0 +1,73 @@
+package com.template.model.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wxx
+ * @since 2023-11-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="Admin对象", description="")
+public class Admin implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "管理端用户表")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "角色")
+    private String role;
+
+    @ApiModelProperty(value = "账号")
+    private String userNumber;
+
+    @ApiModelProperty(value = "密码")
+    private String passWord;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "手机号")
+    private String phoneNumber;
+
+    @ApiModelProperty(value = "部门")
+    private String department;
+
+    @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")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleted;
+
+
+}

src/main/java/com/template/model/result/Result.java

@@ -0,0 +1,81 @@
+/*
+package com.template.model.result;
+
+import com.flyhigh.common.config.CoreConstant;
+import com.flyhigh.common.exception.CustomizeException;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+
+*/
+/**
+ * 请求响应数据
+ *
+ * @param <T> 数据类型
+ *//*
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("请求响应数据")
+public class Result<T> implements Serializable {
+    */
+/**
+     * 数据
+     *//*
+
+    @ApiModelProperty("数据")
+    private T data;
+    */
+/**
+     * 信息
+     *//*
+
+    @ApiModelProperty("信息")
+    private String message;
+    */
+/**
+     * 状态码
+     *//*
+
+    @ApiModelProperty("状态码")
+    private int code;
+
+    public static <T> Result<T> ok() {
+        return new Result<>(null, "" , 200);
+    }
+
+    public static <T> Result<T> ok(T data) {
+        return new Result<>(data, "" , 200);
+    }
+
+    public static <T> Result<T> ok(T data, String message) {
+        return new Result<>(data, message, 200);
+    }
+
+    public static <T> Result<T> fail(String message, int code) {
+        return new Result<>(null, message, code);
+    }
+
+    public static <T> Result<T> fail(T data, String message, int code) {
+        return new Result<>(data, message, code);
+    }
+
+    public static <T> Result<T> fail(CustomizeException e) {
+        return new Result<>(null, e.getMessage(), e.getCode());
+    }
+
+    public static <T> Result<T> failClient(String message) {
+        return new Result<>(null, message, CoreConstant.CLIENT_LOGIC_ERROR);
+    }
+
+    public static <T> Result<T> failSystem(String message) {
+        return new Result<>(null, message, CoreConstant.SERVER_LOGIC_ERROR);
+    }
+}
+*/

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

@@ -20,6 +20,12 @@ public class LoginVO {
      * 加密后的用户ID
      */
     private String userhead;
+
+    /**
+     * 新增，没加密，用户ID
+     */
+    private Integer id;
+
     /**
      * 用户token
      */

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

@@ -0,0 +1,74 @@
+package com.template.model.vo;
+
+import com.template.common.annotation.Generator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 权限详情
+ * <p/>
+ * 2022-11-28 23:13:07
+ */
+@Data
+@ApiModel("权限详情")
+public class PermissionsDetailVO {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    @Generator
+    private Long id;
+
+    /**
+     * 父级权限ID
+     */
+    @ApiModelProperty("父级权限ID")
+    @Generator
+    private Long parentId;
+
+    /**
+     * 名称
+     */
+    @ApiModelProperty("名称")
+    @Generator
+    private String name;
+
+    /**
+     * 请求类型
+     */
+    @ApiModelProperty("请求类型")
+    @Generator
+    private String method;
+
+    /**
+     * 请求路径
+     */
+    @ApiModelProperty("请求路径")
+    @Generator
+    private String uri;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    @Generator
+    private Integer seq;
+
+    /**
+     * 是否禁用
+     */
+    @ApiModelProperty("是否禁用")
+    @Generator
+    private Boolean disabled;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @Generator
+    private LocalDateTime createTime;
+}

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

@@ -0,0 +1,43 @@
+/*
+package com.template.model.vo;
+
+import com.flyhigh.common.entity.TreeVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+*/
+/**
+ * 权限树
+ *//*
+
+@Data
+@ApiModel("权限树")
+@EqualsAndHashCode(callSuper = true)
+public class PermissionsTreeVO extends TreeVo<PermissionsTreeVO> {
+    */
+/**
+     * 名称
+     *//*
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    */
+/**
+     * 请求路径
+     *//*
+
+    @ApiModelProperty("请求路径")
+    private String uri;
+
+    */
+/**
+     * 是否禁用
+     *//*
+
+    @ApiModelProperty("是否禁用")
+    private Boolean disabled;
+}
+*/

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

@@ -0,0 +1,94 @@
+/*
+package com.template.model.vo;
+
+import com.flyhigh.common.annotation.Generator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+*/
+/**
+ * 权限
+ * <p/>
+ * 2022-11-28 23:13:07
+ *//*
+
+@Data
+@ApiModel("权限")
+public class PermissionsVO {
+
+    */
+/**
+     * ID
+     *//*
+
+    @ApiModelProperty("ID")
+    @Generator
+    private Long id;
+
+    */
+/**
+     * 父级权限ID
+     *//*
+
+    @ApiModelProperty("父级权限ID")
+    @Generator
+    private Long parentId;
+
+    */
+/**
+     * 名称
+     *//*
+
+    @ApiModelProperty("名称")
+    @Generator
+    private String name;
+
+    */
+/**
+     * 请求类型
+     *//*
+
+    @ApiModelProperty("请求类型")
+    @Generator
+    private String method;
+
+    */
+/**
+     * 请求路径
+     *//*
+
+    @ApiModelProperty("请求路径")
+    @Generator
+    private String uri;
+
+    */
+/**
+     * 排序
+     *//*
+
+    @ApiModelProperty("排序")
+    @Generator
+    private Integer seq;
+
+    */
+/**
+     * 是否禁用
+     *//*
+
+    @ApiModelProperty("是否禁用")
+    @Generator
+    private Boolean disabled;
+
+    */
+/**
+     * 创建时间
+     *//*
+
+    @ApiModelProperty("创建时间")
+    @Generator
+    private LocalDateTime createTime;
+}
+*/

src/main/java/com/template/services/AdminService.java

@@ -0,0 +1,20 @@
+package com.template.services;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.template.model.pojo.Admin;
+import com.template.model.pojo.RepairAdmin;
+import com.template.model.result.PageUtils;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wxx
+ * @since 2023-11-16
+ */
+public interface AdminService extends IService<Admin> {
+
+    Admin getAdminByAccount(String Account);
+
+}

src/main/java/com/template/services/impl/AdminServiceImpl.java

@@ -0,0 +1,34 @@
+package com.template.services.impl;
+
+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.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wxx
+ * @since 2023-11-16
+ */
+@Service
+public class AdminServiceImpl extends ServiceImpl<AdminMapper, Admin> implements AdminService {
+
+    @Autowired
+    private AdminMapper adminMapper;
+
+    @Override
+    public Admin getAdminByAccount(String Account) {
+        QueryWrapper<Admin> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_number", Account);
+        Admin result = adminMapper.selectOne(queryWrapper);
+        return result;
+    }
+
+}

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

@@ -0,0 +1,5 @@
+<?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.AdminMapper">
+
+</mapper>

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

@@ -1,5 +1,12 @@
 <?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.PermissionSettingMapper">
-
+    <!-- Generator -->
+    <resultMap id="permissionsResult" type="com.template.model.vo.PermissionsVO" autoMapping="true">
+        <id column="id" property="id"/>
+    </resultMap>
+    <!-- Generator -->
+    <resultMap id="permissionsDetailResult" type="com.template.model.vo.PermissionsDetailVO" autoMapping="true">
+        <id column="id" property="id"/>
+    </resultMap>
 </mapper>