最新代码

.idea/workspace.xml

@@ -5,434 +5,20 @@
   </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/AlarmMessageControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/ApartmentSettingControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/AppletLoginControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/ApplicationProcedureControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/ApplicationProcedureSettingControllerApi.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/ApplicationProcedureTemporaryControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/CallSystemControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/CheckOutSettingControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/ElectricEquipmentControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/FacilityServicesControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/HouseLockControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/HouseNumberControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/OperatingRecordControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/PayRecordControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/SubsidySetupControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/UnlockingAdminControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/UnlockingControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/UnlockingRecordControllerAPI.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/HttpUtils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/HttpsClient.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/MessageDecryptUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/MyX509TrustManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/PasswordChecker.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/PushMessage.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/SHA1.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/StrUtils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/SubscribeSample.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/TimeExchange.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/WechatPayApiV3Util.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/WxConstants.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/WxUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/weixin/UnifiedOrderVO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/config/WxPayV3Config.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/AppletLoginController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/AdminDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/ApartmentSettingDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/AppletApprovalProcessDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/ApplicationProcedurSettingDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/ApplicationProcedureDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/ApplicationProcedureTemporaryDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/ApprovalProcessDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/BingingDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/CallSystemSaveOrUpdateDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/CancelAppletDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/CheckOutAppletDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/CheckOutSettingSaveOrUpdateDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/FacilityServicesSaveDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/FacilityServicesUpdateDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/HouseNumberBindingDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/HouseNumberDeleteBindingDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/KeyCardDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/KeyFingerprintDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/KeyPassWordDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/RemoteUnlocking.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/SaveAdminDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/SubsidySetupSaveOrUpdateDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/UpdateAdminDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/UpdateMenuPermissionSettingDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/WxPayDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/enumModel/ePayStatu.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/mqtt/MqttConfiguration.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/mqtt/MqttPushClient.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/mqtt/PushCallback.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/mqtt/SpringUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/AdminMenuVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/AdminVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ApartmentSettingVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ApplicationProcedureTemporaryVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/ApplicationProcedureVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/CoverPictureVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseAppletPageVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseOrderVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/OrderPageVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/UnlockingKeyVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/UsersPageVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/houseLockListVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/BizCodeEnume.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/DateTimeZoneUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/FileIOUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/JSAPIPayParamVO.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/MyRestTempleteUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/PayUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/RRException.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/SecurityUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/WechatPayV3Util.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/cert/apiclient_cert.p12" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/cert/apiclient_cert.pem" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/cert/apiclient_key.pem" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/cert/wx_cert.pem" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/CleanRoomDtos.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/DirtyRoomDtos.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseStateManagementVo.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/hs_err_pid5336.log" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.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/MybatisPlusApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/MybatisPlusApplication.java" 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/HouseAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/HouseAPI.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/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/PermissionSettingAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/PermissionSettingAPI.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/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/AesUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/AesUtils.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/common/utils/weixin/DictionaryCompare.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/weixin/DictionaryCompare.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/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/HouseLockController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseLockController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/HouseNumberControllerAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/HouseNumberControllerAPI.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/controller/AppletLoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/AppletLoginController.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/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/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/UnlockingController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/UnlockingController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/UploadServlet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/UploadServlet.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/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/core/JwtlnterceptorConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/core/JwtlnterceptorConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/handler/MyMetaObjectHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/handler/MyMetaObjectHandler.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/HouseNumberMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseNumberMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/UnlockingMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/UnlockingMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/UsersMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/UsersMapper.java" afterDir="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/CheckIdCardDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/CheckIdCardDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/dto/RoomChangeDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/RoomChangeDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/dto/UsersDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/UsersDto.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/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/AdminMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/AdminMenu.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/ClassSchedule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/ClassSchedule.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/House.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/House.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/HouseLock.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/HouseLock.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" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/HouseOrder.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/HouseOrderBill.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/HouseOrderBill.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/HousePrice.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/HousePrice.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/PermissionSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/PermissionSetting.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/Unlocking.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/pojo/Unlocking.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/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/weixin/AccessToken.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/CodeEntity.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/CodeEntityVo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/Ordering.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/Pay.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/PayResult.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/Users.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/WechatResult.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/WechatUnifiedOrder.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/Wechat_userinfo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/WeiXinUtil.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/weixin/Wx_user.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/AdminMenuService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/AdminMenuService.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/model/dto/DirtyRoomDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/dto/DirtyRoomDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/model/mqtt/MqttPushClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/model/mqtt/MqttPushClient.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/HouseNumberService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/HouseNumberService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/HouseService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/HouseService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/PermissionSettingService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/PermissionSettingService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/UnlockingService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/UnlockingService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/UsersMenuService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/UsersMenuService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/UsersService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/UsersService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/AdminMenuServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/AdminMenuServiceImpl.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/java/com/template/services/impl/HouseNumberServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseNumberServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/PermissionSettingServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/PermissionSettingServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/UnlockingServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/UnlockingServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/UsersMenuServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/UsersMenuServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/UsersServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/UsersServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-prod.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseMapper.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/UnlockingMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/UnlockingMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/UsersMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/UsersMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application-dev.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application-prod.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/application.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/repair/model/request/freezeRepairAdminRequest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/repair/model/request/queryAccountPageRequest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/repair/model/request/updateRepairAdminRequest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/AutoCode.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/MybatisPlusApplication.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/annotation/ControllerIsShow.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/annotation/Encrypt.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/annotation/PassToken.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/annotation/UserLoginCheck.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/aop/LoginCheckAspect.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/AdminAPI.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/AdminMenuAPI.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/ClassScheduleAPI.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/ExcelControllerAPI.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/HouseAPI.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/HouseNumberStateAPI.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/HouseOrderAPI.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/HousePriceAPI.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/LoginControllerAPI.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/PermissionSettingAPI.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/UsersAPI.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/api/UsersMenuAPI.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/annotation/Generator.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/annotation/IgnorePermissionsCheck.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/exception/EmsException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/exception/EmsExceptionHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/exception/MyCustomException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/result/Code.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/result/ResponseStatusEnum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/AES.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/AesUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/CommonUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/DateUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/DoorLockAESUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/DoorLockMD5Util.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/EncryptionUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/ExcelUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/FileUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/Func.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/HttpClientHelper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/JWTUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/MD5.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/MyBase64.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/RSAUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/SendSms.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/ValidateCode.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/WaterElectricDataEncAndDecUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/WaterElectricSignUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/paramUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/smsUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/weixin/DictionaryCompare.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/weixin/EndPay.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/weixin/JaxbUtil$CollectionWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/weixin/JaxbUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/weixin/PayWxUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/common/utils/weixin/TongYiReturn.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/component/WaterElectricComponent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/component/WeiXiaoComponent$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/component/WeiXiaoComponent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/config/DoorLockConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/config/MyBatisPlusConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/config/MySecurity.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/config/WaterElectricConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/config/WeixiaoConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/AdminController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/AdminMenuController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/ClassScheduleController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/ExcelController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HouseController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HouseLockController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HouseNumberController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HouseNumberStateController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HouseOrderBillController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HouseOrderController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HousePriceController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/LoginController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/PasswordIssController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/PermissionSettingController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/UnlockingController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/UploadServlet.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/UsersController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/UsersMenuController.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/core/CORSConfiguration$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/core/CORSConfiguration.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/core/JwtAuthenticationInterceptor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/core/JwtlnterceptorConfig.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/core/ReplaceStreamFilter.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/core/RequestWrapper$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/core/RequestWrapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/core/SwaggerConfiguration.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/handle/NonStaticResourceHttpRequestHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/handler/MyMetaObjectHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/AdminMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/AdminMenuMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/ClassScheduleMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseLockMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseNumberMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseNumberStateMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseOrderBillMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseOrderMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HousePriceMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/PermissionSettingMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/UnlockingMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/UsersMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/UsersMenuMapper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/AlterDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/AlterPriceDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/BillHandleResultDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/CancelDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/CardInfoDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/CheckIdCardDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/CheckOutDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/CleanRoomDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/DirtyRoomDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/EstablishOrderDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/EventMessageDTO$EventMessageDTOBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/EventMessageDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/FingerprintDataDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/HouseDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/HousePriceAlterDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/LockRoomDTO$LockRoomDTOBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/LockRoomDTO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/MaintainDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/PasswordDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/ReserveDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/RoomChangeDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/SaveParentDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/SaveParentUserDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/SaveSecondaryDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/SaveSecondaryUserDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/UsersDetailsDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/dto/UsersDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/enumModel/PasswordUrlEnum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/enumModel/eIsSuper.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/enumModel/eStatu.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/Admin.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/AdminMenu.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/ClassSchedule.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/House.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseLock.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseNumber.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseNumberState.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseOrder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HouseOrderBill.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/HousePrice.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/LockRoomDto.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/PermissionSetting.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/Unlocking.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/Users.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/pojo/UsersMenu.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/request/changePasswordRequest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/request/loginRequest.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/result/BaseResult.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/result/CommonResult.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/result/PageUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/AdminMenuTreeVo$AdminMenuTreeVoBuilder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/AdminMenuTreeVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/AlterPriceRecordVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/CalendarPageVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/ClassListVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseNumberStateDateVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseNumberStatePageVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseOrderPageListVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HousePricePageVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HousePriceVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseStateVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseStustaVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HouseVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/HousedetailsVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/LoginVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/ParticularHouseNumberStatusVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/PermissionsDetailVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/PermissionsTreeVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/PermissionsVO.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/PriceVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/QueryExportVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/ReserveDayVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/RoomTypeVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/vo/ScheduleVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/AccessToken.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/CodeEntity.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/CodeEntityVo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/Ordering.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/Pay.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/PayResult.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/Users.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/WechatResult.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/WechatUnifiedOrder.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/Wechat_userinfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/WeiXinUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/model/weixin/Wx_user.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/AdminMenuService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/AdminService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/ClassScheduleService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/HouseLockService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/HouseNumberService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/HouseNumberStateService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/HouseOrderBillService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/HouseOrderService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/HousePriceService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/HouseService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/PermissionSettingService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/UnlockingService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/UsersMenuService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/UsersService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/AdminMenuServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/AdminServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/ClassScheduleServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseLockServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseNumberServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseNumberStateServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseOrderBillServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseOrderServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HousePriceServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/PermissionSettingServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/UnlockingServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/UsersMenuServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/UsersServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/AdminMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/AdminMenuMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/ClassScheduleMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HouseLockMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HouseMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HouseNumberMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HouseNumberStateMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HouseOrderBillMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HouseOrderMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/HousePriceMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/PermissionSettingMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/UnlockingMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/UsersMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/mapper/template/UsersMenuMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-archiver/pom.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/com/template/MybatisPlusApplicationTests.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/com/template/WrapperTest.class" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -663,7 +249,10 @@
       <workItem from="1718351916607" duration="1852000" />
       <workItem from="1718589597123" duration="9394000" />
       <workItem from="1718790560373" duration="618000" />
-      <workItem from="1718855981011" duration="9047000" />
+      <workItem from="1718855981011" duration="13620000" />
+      <workItem from="1719450617842" duration="1267000" />
+      <workItem from="1719468917857" duration="202000" />
+      <workItem from="1719803543119" duration="24302000" />
     </task>
     <servers />
   </component>
@@ -696,27 +285,27 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>533</line>
+          <line>547</line>
           <option name="timeStamp" value="48" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>858</line>
+          <line>872</line>
           <option name="timeStamp" value="50" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>623</line>
+          <line>637</line>
           <option name="timeStamp" value="61" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>678</line>
+          <line>692</line>
           <option name="timeStamp" value="62" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseNumberStateController.java</url>
-          <line>642</line>
+          <line>656</line>
           <option name="timeStamp" value="64" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
@@ -765,29 +354,14 @@
           <option name="timeStamp" value="181" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/model/weixin/MyRestTempleteUtil.java</url>
-          <line>48</line>
-          <option name="timeStamp" value="203" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/model/weixin/MyRestTempleteUtil.java</url>
-          <line>33</line>
-          <option name="timeStamp" value="207" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/model/weixin/MyRestTempleteUtil.java</url>
-          <line>49</line>
-          <option name="timeStamp" value="213" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java</url>
           <line>1674</line>
           <option name="timeStamp" value="218" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/template/controller/HouseOrderController.java</url>
-          <line>1649</line>
-          <option name="timeStamp" value="223" />
+          <url>file://$PROJECT_DIR$/src/main/java/com/template/model/weixin/MyRestTempleteUtil.java</url>
+          <line>33</line>
+          <option name="timeStamp" value="224" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>

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

@@ -33,4 +33,7 @@ public interface HouseNumberControllerAPI {
     @ApiOperation(value = "水电表删除绑定", notes = "水电表删除绑定", httpMethod = "POST")
     CommonResult delete(@RequestBody HouseNumberDeleteBindingDto houseNumberDeleteBindingDto);
 
+
+
+
 }

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

@@ -3,6 +3,8 @@ package com.template.api;
 import com.template.model.dto.*;
 import com.template.model.pojo.LockRoomDto;
 import com.template.model.result.CommonResult;
+import com.template.model.vo.CleanRoomDtos;
+import com.template.model.vo.DirtyRoomDtos;
 import com.tencentcloudapi.mrs.v20200910.models.Check;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,7 +17,7 @@ public interface HouseNumberStateAPI {
 
     @GetMapping("/dayList")
     @ApiOperation(value = "房态管理-单日", notes = "房态管理-单日", httpMethod = "GET")
-    CommonResult page(String keyWord, String houseType, int page, int size);
+    CommonResult page(String keyWord, String houseType);
 
 
     @GetMapping("/calendarList")
@@ -74,6 +76,12 @@ public interface HouseNumberStateAPI {
     @ApiOperation(value = "房态管理-置净", notes = "房态管理-置净", httpMethod = "POST")
     CommonResult cleanRoom(@RequestBody CleanRoomDto cleanRoomDto);
 
+    @PostMapping("/dirtyRooms")
+    @ApiOperation(value = "房态管理-批量置脏", notes = "房态管理-批量置脏", httpMethod = "POST")
+    CommonResult dirtyRooms(@RequestBody DirtyRoomDtos dirtyRoomDtos);
 
+    @PostMapping("/cleanRooms")
+    @ApiOperation(value = "房态管理-批量置净", notes = "房态管理-批量置净", httpMethod = "POST")
+    CommonResult cleanRooms(@RequestBody CleanRoomDtos cleanRoomDtos);
 
 }

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

@@ -13,10 +13,12 @@ import com.template.common.utils.HttpsClient;
 import com.template.common.utils.JWTUtil;
 import com.template.model.pojo.Admin;
 import com.template.model.pojo.AdminMenu;
+import com.template.model.pojo.PermissionSetting;
 import com.template.model.pojo.Users;
 import com.template.model.result.CommonResult;
 import com.template.services.AdminMenuService;
 import com.template.services.AdminService;
+import com.template.services.PermissionSettingService;
 import com.template.services.UsersService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +48,8 @@ public class AppletLoginController implements AppletLoginControllerAPI {
     @Autowired
     AdminMenuService adminMenuService;
 
+    @Autowired
+    PermissionSettingService permissionSettingService;
 
     @Override
     @PassToken
@@ -101,6 +105,7 @@ public class AppletLoginController implements AppletLoginControllerAPI {
             String telephone = userInfoMap.get("telephone").toString();
             String headImage = userInfoMap.get("head_image").toString();
 
+
 //            判断账号是否以添加,
             LambdaQueryWrapper<Users> wrapperU=new LambdaQueryWrapper<>();
             wrapperU.eq(Users::getCardNumber,cardNumber);
@@ -111,7 +116,7 @@ public class AppletLoginController implements AppletLoginControllerAPI {
             String adminMenuId="";
             String adminMenuName="";
             String usersId="";
-
+            String manager="0";
             if (ObjectUtils.isNotEmpty(users)) {
                  usersId = String.valueOf(users.getId());
 //                通过用户id找到管理端用户id和角色id
@@ -128,6 +133,26 @@ public class AppletLoginController implements AppletLoginControllerAPI {
                     if (ObjectUtils.isNotEmpty(adminMenu)) {
                          adminMenuName = adminMenu.getName();
                     }
+                    //            判断是否是管理员
+                    PermissionSetting permissionSetting = permissionSettingService.getById(adminMenuId);
+                    if (ObjectUtils.isNotEmpty(permissionSetting)) {
+                        //      判断该用户是否拥有权限
+                        //      判断该用户是否拥有权限
+                        String processManagement = permissionSetting.getProcessManagement();
+                        if (processManagement.equals("0")) {
+                            manager="1";
+                        }else if (processManagement.contains("3")&&processManagement.contains("4")&&processManagement.contains("5")){
+                            manager="1";
+                        }
+                    }
+
+
+
+                }
+                String department = users.getDepartment();
+                if (!department.equals(identityTitle)) {
+                    users.setDepartment(identityTitle);
+                    usersService.updateById(users);
                 }
 
             }else {
@@ -142,8 +167,10 @@ public class AppletLoginController implements AppletLoginControllerAPI {
                 usersId=String.valueOf(users1.getId());
             }
             String user_head = AesUtils.encrypt(adminId);
+
+
           //  System.out.println("重定向路径=" + "redirect:"+ "https://chtech.ncjti.edu.cn/hotel/h5/#/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head);
-           return "redirect:"+ "https://chtech.ncjti.edu.cn/hotel/h5/#/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head+"&name="+name+"&telephone="+telephone;
+           return "redirect:"+ "https://chtech.ncjti.edu.cn/hotel/h5/#/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head+"&name="+name+"&telephone="+telephone+"&department="+identityTitle+"&manager="+manager;
            // return "redirect:"+ "http://192.168.161.225:8000/hotel/h5/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head+"&name="+encodeName+"&telephone="+telephone;
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -36,6 +36,7 @@ import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -100,22 +101,35 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
     ElectricEquipmentService electricEquipmentService;
 
     @Override
-    public CommonResult page(String keyWord, String houseType, int page, int size) {
+    public CommonResult page(String keyWord, String houseType) {
 
-        if (ObjectUtils.isEmpty(page) && page <= 0) {
-            page = 1;
-        }
-
-        if (ObjectUtils.isEmpty(size) && size <= 0) {
-            size = 10;
-        }
+//        if (ObjectUtils.isEmpty(page) && page <= 0) {
+//            page = 1;
+//        }
+//
+//        if (ObjectUtils.isEmpty(size) && size <= 0) {
+//            size = 10;
+//        }
 
 //        当时时间
         Date date = new Date();
+        List<House> list = houseService.list(new LambdaQueryWrapper<>());
+
+        List<HouseStateVo> pageVo = houseNumberService.houseStatePage(keyWord, houseType, date);
+        ArrayList<HouseStateManagementVo> vos = new ArrayList<>();
+        for (House house : list) {
+            HouseStateManagementVo vo = new HouseStateManagementVo();
+            vo.setId(house.getId());
+            vo.setName(house.getRoomName());
+            vo.setRoomType(house.getRoomType());
+            List<HouseStateVo> ownerClasses = pageVo.stream().filter(e -> e.getHouseId().equals(house.getId() + "")).collect(Collectors.toList());
+            if (ownerClasses != null && ownerClasses.size() > 0) {
+                vo.setVos(ownerClasses);
+            }
+            vos.add(vo);
+        }
 
-        PageUtils<HouseStateVo> pageVo = houseNumberService.houseStatePage(keyWord, houseType, page, size, date);
-
-        return CommonResult.ok(pageVo);
+        return CommonResult.ok(vos);
     }
 
     @Override
@@ -776,7 +790,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             operatingRecord.setRoomNumber(roomNumber);
             operatingRecord.setOperatorName(byId.getName());
             operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
-            operatingRecord.setContent("姓名:"+liveName);
+            operatingRecord.setContent("姓名:" + liveName);
 
             if ("1".equals(lockStatus)) {
                 PasswordDto pr = new PasswordDto();
@@ -1036,7 +1050,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 operatingRecord.setOperatorName(byId.getName());
                 DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                 operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
-                operatingRecord.setContent("姓名:"+houseOrder.getLiveName());
+                operatingRecord.setContent("姓名:" + houseOrder.getLiveName());
                 operatingRecord.setType("删除锁钥匙");
                 operatingRecordService.save(operatingRecord);
             }
@@ -1059,7 +1073,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             operatingRecord.setOperatorName(byId.getName());
             DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
-            operatingRecord.setContent("姓名:"+houseOrder.getLiveName());
+            operatingRecord.setContent("姓名:" + houseOrder.getLiveName());
 
             if ("1".equals(lockStatus)) {
                 PasswordDto pr = new PasswordDto();
@@ -1165,12 +1179,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
 //            boolean effectiveDate = DateUtil.isEffectiveDate(new Date(), liveTime, endTime);
 //            if (!effectiveDate) {
-                HouseNumberState houseNumberStateData=houseNumberStateService.getData(new Date(),houseNumberId);
-                if (ObjectUtils.isNotEmpty(houseNumberStateData)) {
-                    houseOrder.setLeaveTime(Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter).atZone(ZoneId.systemDefault()).toInstant()));
-                    houseOrderService.updateById(houseOrder);
-                    return CommonResult.ok("该时间段已超过退房时间，已修改其订单状态");
-                }
+            HouseNumberState houseNumberStateData = houseNumberStateService.getData(new Date(), houseNumberId);
+            if (ObjectUtils.isNotEmpty(houseNumberStateData)) {
+                houseOrder.setLeaveTime(Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter).atZone(ZoneId.systemDefault()).toInstant()));
+                houseOrderService.updateById(houseOrder);
+                return CommonResult.ok("该时间段已超过退房时间，已修改其订单状态");
+            }
 //            }
 
             //      获取水电消费金额和额度
@@ -1226,7 +1240,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
 //        修改房态
 
-            LambdaQueryWrapper<HouseNumberState> wrapperHns=new LambdaQueryWrapper<>();
+            LambdaQueryWrapper<HouseNumberState> wrapperHns = new LambdaQueryWrapper<>();
             wrapperHns.eq(HouseNumberState::getOrderNumber, orderNumber);
             wrapperHns.eq(HouseNumberState::getHouseNumberId, houseNumberId);
             HouseNumberState houseNumberState = houseNumberStateService.getOne(wrapperHns);
@@ -1292,7 +1306,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
         List<HouseNumberState> houseNumberStates = houseNumberStateService.beBooked(houseNumberId, startTime, endTime);
 
-        if (ObjectUtils.isNotEmpty(houseNumberStates)&&houseNumberStates.size()>0) {
+        if (ObjectUtils.isNotEmpty(houseNumberStates) && houseNumberStates.size() > 0) {
             return CommonResult.fail("该时间断内已有其他状态");
         }
 
@@ -1329,7 +1343,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
         List<HouseNumberState> houseNumberStates = houseNumberStateService.beBooked(houseNumberId, startTime, endTime);
 
-        if (ObjectUtils.isNotEmpty(houseNumberStates)&&houseNumberStates.size()>0) {
+        if (ObjectUtils.isNotEmpty(houseNumberStates) && houseNumberStates.size() > 0) {
             return CommonResult.fail("该时间断内已有其他状态");
         }
 
@@ -1400,6 +1414,82 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         return CommonResult.ok();
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public CommonResult dirtyRooms(DirtyRoomDtos dirtyRoomDtos) {
+        int adminId = dirtyRoomDtos.getAdminId();
+        PermissionSetting permissionSetting = permissionSettingService.getById(adminId);
+        if (ObjectUtils.isEmpty(permissionSetting)) {
+            return CommonResult.fail("非法进入");
+        }
+//      判断该用户是否拥有权限
+        String houseTypeManagement = permissionSetting.getHouseStatusManagement();
+        if (!"0".equals(houseTypeManagement) && !"9".equals(houseTypeManagement)) {
+            return CommonResult.fail("此账号暂无该权限");
+        }
+        List<String> list = dirtyRoomDtos.getHouseNumberIds();
+        try {
+            for (String s : list) {
+                HouseNumber houseNumber = houseNumberService.getById(s);
+                if (ObjectUtils.isEmpty(houseNumber)) {
+                    return CommonResult.fail("房间异常");
+                }
+
+                houseNumber.setHouseStatus(2);
+
+                boolean update = houseNumberService.updateById(houseNumber);
+                if (!update) {
+                    return CommonResult.fail();
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return CommonResult.fail();
+        }
+
+        return CommonResult.ok();
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public CommonResult cleanRooms(CleanRoomDtos cleanRoomDtos) {
+        int adminId = cleanRoomDtos.getAdminId();
+        PermissionSetting permissionSetting = permissionSettingService.getById(adminId);
+        if (ObjectUtils.isEmpty(permissionSetting)) {
+            return CommonResult.fail("非法进入");
+        }
+//      判断该用户是否拥有权限
+        String houseTypeManagement = permissionSetting.getHouseStatusManagement();
+        if (!"0".equals(houseTypeManagement) && !houseTypeManagement.contains("9")) {
+            return CommonResult.fail("此账号暂无该权限");
+        }
+        List<String> houseNumberIds = cleanRoomDtos.getHouseNumberIds();
+        try {
+            for (String houseNumberId : houseNumberIds) {
+                HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
+                if (ObjectUtils.isEmpty(houseNumber)) {
+                    return CommonResult.fail("房间异常");
+                }
+
+                houseNumber.setHouseStatus(1);
+//        关电
+                houseNumber.setElectricType("2");
+//        todo 关电
+                electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+
+                houseNumberService.updateById(houseNumber);
+                boolean update = houseNumberService.updateById(houseNumber);
+                if (!update) {
+                    return CommonResult.fail();
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return CommonResult.fail();
+        }
+        return CommonResult.ok();
+    }
+
 
 }
 

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

@@ -24,7 +24,7 @@ import java.util.List;
 @Mapper
 public interface HouseNumberMapper extends BaseMapper<HouseNumber> {
 
-    IPage<HouseStateVo> houseStatePage(Page<HouseStateVo> pageVo, @Param("keyWord") String keyWord,@Param("houseType") String houseType,@Param("date") Date date);
+    List<HouseStateVo> houseStatePage(@Param("keyWord") String keyWord,@Param("houseType") String houseType,@Param("date") Date date);
 
     IPage<CalendarPageVo> houseStateCalendarPage(Page<CalendarPageVo> pageVo, @Param("keyWord") String keyWord, @Param("houseType") String houseType);
 

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

@@ -8,4 +8,5 @@ public class DirtyRoomDto {
 
     private String houseNumberId;
 
+
 }

src/main/java/com/template/model/mqtt/MqttPushClient.java

@@ -57,7 +57,7 @@ public class MqttPushClient  {
     /**
      * 连接测试
      */
-    @Scheduled(cron = "0 19 * * * ? ")
+//    @Scheduled(cron = "0 19 * * * ? ")
     public void getConnect(){
         System.out.println("mqttConfiguration = " + mqttConfiguration);
         String clientId = mqttConfiguration.getClientId();

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

@@ -0,0 +1,12 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CleanRoomDtos {
+    private int adminId;
+
+    private List<String> houseNumberIds;
+}

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

@@ -0,0 +1,12 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DirtyRoomDtos {
+    private int adminId;
+
+    private List<String> houseNumberIds;
+}

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

@@ -0,0 +1,18 @@
+package com.template.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class HouseStateManagementVo {
+    private int id;
+    @ApiModelProperty(value = "房间名称")
+    private String name;
+    @ApiModelProperty(value = "房间类型（1:全日房，2：钟点房）")
+    private Integer roomType;
+
+    private List<HouseStateVo> vos;
+
+}

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

@@ -20,7 +20,7 @@ import java.util.List;
  */
 public interface HouseNumberService extends IService<HouseNumber> {
 
-    PageUtils<HouseStateVo> houseStatePage(String keyWord, String houseType, int page, int size, Date date);
+    List<HouseStateVo> houseStatePage(String keyWord, String houseType, Date date);
 
     PageUtils<CalendarPageVo> houseStateCalendarPage(String keyWord, String houseType, int page, int size);
 

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

@@ -38,10 +38,10 @@ public class HouseNumberServiceImpl extends ServiceImpl<HouseNumberMapper, House
     HouseNumberMapper houseNumberMapper;
 
     @Override
-    public PageUtils<HouseStateVo> houseStatePage(String keyWord, String houseType, int page, int size, Date date) {
-        Page<HouseStateVo> pageVo = new Page<>(page,size);
-        IPage<HouseStateVo> result=houseNumberMapper.houseStatePage(pageVo,keyWord,houseType,date);
-        return new PageUtils(result);
+    public List<HouseStateVo> houseStatePage(String keyWord, String houseType, Date date) {
+
+        List<HouseStateVo> result=houseNumberMapper.houseStatePage(keyWord,houseType,date);
+        return result;
     }
 
     @Override

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

@@ -8,7 +8,6 @@
         hn.house_id as houseId,
         hn.room_number as houseNumber,
         hn.house_status as houseStatus,
-        -- hn.`status` as houseType,
         h.room_name as houseName,
         hns.`status` AS status,
         ho.reserve_name as reserveName,

target/classes/META-INF/spring-configuration-metadata.json

@@ -0,0 +1,98 @@
+{
+  "groups": [
+    {
+      "name": "water-electric",
+      "type": "com.template.config.WaterElectricConfig",
+      "sourceType": "com.template.config.WaterElectricConfig"
+    },
+    {
+      "name": "wechat.pay.v3",
+      "type": "com.template.config.WxPayV3Config",
+      "sourceType": "com.template.config.WxPayV3Config"
+    }
+  ],
+  "properties": [
+    {
+      "name": "water-electric.data-secret",
+      "type": "java.lang.String",
+      "description": "运营商数据秘钥",
+      "sourceType": "com.template.config.WaterElectricConfig"
+    },
+    {
+      "name": "water-electric.data-secret-iv",
+      "type": "java.lang.String",
+      "description": "数据秘钥初始化向量",
+      "sourceType": "com.template.config.WaterElectricConfig"
+    },
+    {
+      "name": "water-electric.operator-id",
+      "type": "java.lang.String",
+      "description": "运营商标识",
+      "sourceType": "com.template.config.WaterElectricConfig"
+    },
+    {
+      "name": "water-electric.operator-secret",
+      "type": "java.lang.String",
+      "description": "运营商秘钥",
+      "sourceType": "com.template.config.WaterElectricConfig"
+    },
+    {
+      "name": "water-electric.service-host",
+      "type": "java.lang.String",
+      "description": "服务地址",
+      "sourceType": "com.template.config.WaterElectricConfig"
+    },
+    {
+      "name": "water-electric.sign-key",
+      "type": "java.lang.String",
+      "description": "签名秘钥",
+      "sourceType": "com.template.config.WaterElectricConfig"
+    },
+    {
+      "name": "wechat.pay.v3.api-key",
+      "type": "java.lang.String",
+      "sourceType": "com.template.config.WxPayV3Config"
+    },
+    {
+      "name": "wechat.pay.v3.api-key3",
+      "type": "java.lang.String",
+      "sourceType": "com.template.config.WxPayV3Config"
+    },
+    {
+      "name": "wechat.pay.v3.app-id",
+      "type": "java.lang.String",
+      "sourceType": "com.template.config.WxPayV3Config"
+    },
+    {
+      "name": "wechat.pay.v3.cert-p12-path",
+      "type": "java.lang.String",
+      "sourceType": "com.template.config.WxPayV3Config"
+    },
+    {
+      "name": "wechat.pay.v3.cert-path",
+      "type": "java.lang.String",
+      "sourceType": "com.template.config.WxPayV3Config"
+    },
+    {
+      "name": "wechat.pay.v3.domain",
+      "type": "java.lang.String",
+      "sourceType": "com.template.config.WxPayV3Config"
+    },
+    {
+      "name": "wechat.pay.v3.key-path",
+      "type": "java.lang.String",
+      "sourceType": "com.template.config.WxPayV3Config"
+    },
+    {
+      "name": "wechat.pay.v3.mch-id",
+      "type": "java.lang.String",
+      "sourceType": "com.template.config.WxPayV3Config"
+    },
+    {
+      "name": "wechat.pay.v3.platform-cert-path",
+      "type": "java.lang.String",
+      "sourceType": "com.template.config.WxPayV3Config"
+    }
+  ],
+  "hints": []
+}

target/classes/cert/apiclient_cert.pem

@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIUYaM1Y/YVjBuSGieiOk6U6WPdU90wDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjEwNjAyMDMzMzU4WhcNMjYwNjAxMDMzMzU4WjBvMRMwEQYDVQQDDAox
+NjA5ODUzMjUzMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xGzAZBgNVBAsM
+EuWNl+aYjOS6pOmAmuWtpumZojELMAkGA1UEBgwCQ04xETAPBgNVBAcMCFNoZW5a
+aGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvTAOkgGzUmJRAYHl
+XpnYFNTjWeAPDgj/jEkcNvBzCjgh3UU51wWIiVDNFR6+XHhcwJhZGkKm0NV+gpkP
+gGtBmll3Pxtaszlv36/OfCo/zCmKJBeyI/wIBt8IV88gED0S/CK0EAwg/Uktu3G9
+y5BRL8eVLvmQxOkJXXe9t7Y9SIrgS5MYVoMBzDaO5MBcUKq8ScyR6yNPUYqGxLDy
+VA6wjOYLvHc/6ERFqwhFtp7CiymifTZwsb2lO7rh4uXKFB+gtWkkb4+Y94UxLFjl
+yEhIsllHYx7LXSQLgXfhAtI6zQz1Bs2UD5rSbVHy0raAVWdwrXZZeFDNbS2ei5HL
+zH2BVwIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMCBPAwZQYDVR0fBF4w
+XDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2Ny
+bD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyMA0G
+CSqGSIb3DQEBCwUAA4IBAQAGK/6nSXku3QbgVfwp/hIBcLQQWE5x/XbJl72cOVM8
+FAQGUJE5Ge8IQ8Rekvwb1MpnRPy1shjAcsJ4uvvTPIUkavb2lYbQCteuPVAV9zBz
+nMQMNRfnBcK5NGw5ai8QuHJ8T5XdMXSRhB/O7UqTg+cerPrS14uXbQxCdl6cLM0r
+yK6kXPFrDxUI7V+LXE3R62x3Hwmu6sB5BFiwynZDiD6RjZp0B2hI813Xe197Thyx
+YgFkbnD1jo3djWZHtyhfP4DxQniZKOWfRZ99og8uD2F0v5/LgpUn7xTsskohop0a
+Yhp509UUVA1BT+jJDWe8nbGKavApD57O3ZIpK/lX5OmT
+-----END CERTIFICATE-----

target/classes/cert/apiclient_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC9MA6SAbNSYlEB
+geVemdgU1ONZ4A8OCP+MSRw28HMKOCHdRTnXBYiJUM0VHr5ceFzAmFkaQqbQ1X6C
+mQ+Aa0GaWXc/G1qzOW/fr858Kj/MKYokF7Ij/AgG3whXzyAQPRL8IrQQDCD9SS27
+cb3LkFEvx5Uu+ZDE6Qldd723tj1IiuBLkxhWgwHMNo7kwFxQqrxJzJHrI09RiobE
+sPJUDrCM5gu8dz/oREWrCEW2nsKLKaJ9NnCxvaU7uuHi5coUH6C1aSRvj5j3hTEs
+WOXISEiyWUdjHstdJAuBd+EC0jrNDPUGzZQPmtJtUfLStoBVZ3Ctdll4UM1tLZ6L
+kcvMfYFXAgMBAAECggEAOQZFPgk5LfnohNXMd0lT8mOA69Q3dXmM3ZIj6QNtCYWF
+35ZAKunGD+3FAzqzElhNTNge82VntsbDTUYpgAHUUlvpL6JlImSLrhbl3FM3y6gx
+tVNXJLWRDdEoSJ9sALkIAevL7pJZVz85g6hzFuq3Lfmwo+ohktjTM9Ml4jwSGM0O
+XhHJM8SKMZ34rPJdRL65p5xZTDr1SGZoPpcEArrUZ7yxfX2e9vbGs/xGtDAq5pzC
+Y52G4YLbSUvYvmYxM3suoiUMR9SM324Ijm8NcHAc0bC5VOZL33B3c69pIOPgYGa8
+fmpfijjUtYBnKLRJe/SOrASdJDS6i1W5xuAkaShqgQKBgQDuEbzBF9B7Nh0niFUp
+gxPG5EXxO9gbRiGTxdXuVPYwMegfUEIN/BUXNsAOTdUHr1R9KIN9IG5ClC+H5dw/
+dAo7mUpoC4gqd3NkZ2WeUuzAhkpqIOcVWXiPBvIQg/bNE7BRZ+RKzLefjsG3GbQ8
+TrHGkInVydaihlFMFepOwqjetwKBgQDLb9L7FVw3dEXnDRFccLJgIDgOVvWMR84G
+MD2NFZUUDzDqc1IxNxfOmLy2Z8qzYk3CSk6CeG5zoRoPVs7Qjvjh/s9d9QixSxRq
++L27h4hNpmaWEIk91RA/OwKuQL4fuxWBoFNYs3/4L1aA6VrGp2E2gfbx02nG9USa
+3nHsa6nSYQKBgQCimTi7BSHeVVpaOtI3lQ/34scmeQIjtqWOQSvZKOwwhJWOdYl3
+9bkN7tYDrwMVyZlCFl6gIntMO9uuzL6+E+o9RHg+UcoBfy4v4DLWjLqoz8+ZZrmN
+qlseDNddklQJQy5Em1mgAOxVLPJ/tS2VlwXyoZuSidVvkZ+LANjUTD18RwKBgQCZ
+rWCggZNG5NPFZW6++PcWfGA8HN6i2L8+l4R3pl0WaR9XjEQDn42haGnuFNvfxJve
+8Ej8cENnn8RS4A2dKNPDzLwTSv4FCCVlZX/WQNzrY49NPzKdfe0nBsnQnmHBEI9/
+e4BamkZKUmAzQ5RqSpi6F1VXepAGVtM7dlxy7yW7IQKBgQDQU3dMDjehcV7VZ87Y
+eeLV1xMfD9wBQAOaiaMXk3U95wyEJIP0wEsORnpWu1t/x3DtLQDAwHYs13fhzW13
+7QhQ9UaJjYukL5F6ih0NmsFDADzAOQNgWw+0nze8zr7xpzAC/iL3mZS09mxvSu+7
+eEAdNZEjxlxw84+GWVh/KgtjZQ==
+-----END PRIVATE KEY-----

target/classes/cert/wx_cert.pem

@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID3DCCAsSgAwIBAgIUV4MHQrTB1t3csmA7kZ5XtQo2c8UwDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjEwNjAyMDMzMzU3WhcNMjYwNjAxMDMzMzU3WjBuMRgwFgYDVQQDDA9U
+ZW5wYXkuY29tIHNpZ24xEzARBgNVBAoMClRlbnBheS5jb20xHTAbBgNVBAsMFFRl
+bnBheS5jb20gQ0EgQ2VudGVyMQswCQYDVQQGDAJDTjERMA8GA1UEBwwIU2hlblpo
+ZW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6WaCVdRiYuCosNS43
+Z7eW26FxE3GY2OoRNTqXlSFbIRlGvevpffnbTIPQFwLCUOT4xRpMQfh8z8PNh1I5
+/IB4dafUamzZz8P7Dv/AbLiw/g3UI8m/7WTaHlIc0G798MTABW15HHJjrzbvm3w0
+VUfbMh+xGvupUxdMmBFOkjEtqSprb70OtDUvbN23Hzy/HSd7YQnJrobR9WOifY+A
+l5+WBEXSxCF8qeKfBu928D1HeNwdtvaILWc6ygJ1qDgfXEw4rtrKWFSkKZbbm3gy
+jyldbOVPconPq6vMBh6gOICqwzgXJXMtnRpKiNnKK0g4b6w9y7fxt5kFLURMr4NM
+Tmp9AgMBAAGjgYEwfzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE8DBlBgNVHR8EXjBc
+MFqgWKBWhlRodHRwOi8vZXZjYS5pdHJ1cy5jb20uY24vcHVibGljL2l0cnVzY3Js
+P0NBPTFCRDQyMjBFNTBEQkMwNEIwNkFEMzk3NTQ5ODQ2QzAxQzNFOEVCRDIwDQYJ
+KoZIhvcNAQELBQADggEBAGzd76rIpZ4M9BdnEbqWxsNAstlJ4dTmsCGFBLhs8bk/
+YAw822tbyX6s5C94j/Vvik1Raqqj+wpOyJnzflU5EpDgXYJmkPl5E0uMxyAtlFhH
+1c6ukVdZQlXjFQK77GlNsINIrBoWBvHmLRD6y8LhCyu9kwo5ftfoGW8Gf2H9VxBS
+JKFwCeN1klGj2oBA6hKHuult+FjwFT/vpR1urnBf3VtWpQotS+U+zDHrY62Ioalb
+ZrlLNkzVC83p6bVSem+9I4CYftDcptOl6I1AQHiuumj4VxwTaEzCpS1EXIA7YbJv
+f4W/1LcIdz/GL4T378NODJkMhyLYaHAFnCZceNoeO9s=
+-----END CERTIFICATE-----