From 67e8e056ba16c8d90f08143364e92bfe4559046a Mon Sep 17 00:00:00 2001 From: Mauve Date: Tue, 15 Sep 2026 17:04:06 +0800 Subject: [PATCH] optimize codes --- .../controllers/SSOCallbackController.java | 7 +- .../controllers/SSORestProcessController.java | 47 ++--- .../mcrm/allotment/models/CfgAppChannel.java | 11 +- .../allotment/models/CfgOtherAllotment.java | 7 +- .../models/CfgOtherAllotmentView.java | 17 +- .../allotment/models/CfgOtherAppChannel.java | 8 +- .../allotment/models/CfgRoomCriterias.java | 35 +--- .../allotment/repositories/AppChannelDao.java | 9 +- .../repositories/OtherAllotmentDao.java | 10 +- .../repositories/OtherAllotmentViewDao.java | 7 +- .../repositories/RoomCriteriaDao.java | 9 +- .../controller/ApprovalController.java | 2 - .../approval/service/ApprovalService.java | 6 +- .../controllers/CfgSettingController.java | 5 +- .../controllers/ConfigController.java | 17 +- .../dtos/AvailableRoomQueryRequest.java | 2 - .../dtos/ExtendBookingQueryRequest.java | 4 - .../appsetting/dtos/RoomQueryRequest.java | 1 - .../mcrm/appsetting/models/CfgSettings.java | 3 +- .../mcrm/appsetting/models/SysSetting.java | 8 +- .../appsetting/repositories/SettingDao.java | 2 +- .../repositories/SysSettingDao.java | 5 +- .../appsetting/services/ConfigService.java | 62 +++--- .../appsetting/services/SettingService.java | 12 +- .../services/SysSettingService.java | 7 +- .../controllers/MobileLoginController.java | 35 ++-- .../mcrm/authorization/dtos/LoginInfo.java | 6 +- .../authorization/filters/JwtAuthFilter.java | 1 - .../mcrm/authorization/models/SysGroup.java | 14 +- .../models/SysGroupDataPermission.java | 8 +- .../models/SysGroupPermission.java | 7 +- .../mcrm/authorization/models/SysRouter.java | 19 +- .../models/SysRouterPermission.java | 6 +- .../mcrm/authorization/models/SysUser.java | 13 +- .../authorization/models/SysUserSetting.java | 15 +- .../authorization/models/SysUserView.java | 15 +- .../repositories/SysGroupDao.java | 7 +- .../SysGroupDataPermissionDao.java | 6 +- .../repositories/SysGroupPermissionDao.java | 7 +- .../repositories/SysRouterDao.java | 7 +- .../repositories/SysRouterPermissionDao.java | 4 +- .../repositories/SysUserDao.java | 6 +- .../repositories/SysUserSettingDao.java | 6 +- .../repositories/SysUserViewDao.java | 6 +- .../authorization/repositories/TokenDao.java | 2 +- .../services/AuthorizationService.java | 20 +- .../services/MgmUserService.java | 41 ++-- .../services/UserTokenService.java | 4 +- .../agebucket/models/SysAgebucket.java | 12 +- .../agebucket/services/AgebucketService.java | 2 +- .../response/ReservationDoorKeyResponse.java | 4 + .../daylight/models/CfgBlockCodes.java | 14 +- .../daylight/models/CfgDaylightMapping.java | 6 +- .../daylight/models/CfgDaylightView.java | 21 +- .../models/CfgExceptDaylightRoomTypes.java | 10 +- .../daylight/models/CfgExceptionDaylight.java | 12 +- .../models/CfgExceptionDaylightView.java | 17 +- .../models/CfgExceptionOperaView.java | 17 +- .../daylight/models/CfgItemInventory.java | 11 +- .../daylight/models/CfgMarketCodes.java | 11 +- .../models/CfgNonMGMStatusMapping.java | 19 +- .../daylight/models/CfgOperaView.java | 17 +- .../models/CfgOtherFollowUpStatus.java | 9 +- .../daylight/models/CfgOtherSegment.java | 10 +- .../daylight/models/CfgRateCodes.java | 11 +- .../daylight/models/CfgSourceCodes.java | 11 +- .../basesetting/daylight/models/CfgTiers.java | 12 +- .../daylight/repositories/BlockCodeDao.java | 5 +- .../daylight/repositories/DaylightDao.java | 5 +- .../repositories/DaylightViewDao.java | 8 +- .../repositories/ExceptionDaylightDao.java | 5 +- .../ExceptionDaylightViewDao.java | 6 +- .../repositories/ItemInventoryDao.java | 6 +- .../daylight/repositories/MarketCodeDao.java | 5 +- .../daylight/repositories/OperaViewDao.java | 3 - .../repositories/OtherSegmentDao.java | 5 +- .../daylight/repositories/RateCodeDao.java | 5 +- .../daylight/repositories/SourceCodeDao.java | 7 +- .../daylight/repositories/TierDao.java | 6 +- .../daylight/services/DaylightService.java | 28 ++- .../response/DayLightProfileResponse.java | 3 - .../dtos/response/ResultResponse.java | 4 - .../property/models/CfgBlocks.java | 10 +- .../property/models/CfgProperties.java | 11 +- .../property/repositories/BlockDao.java | 5 +- .../property/repositories/PropertyDao.java | 9 +- .../room/models/CfgBedTypeMapping.java | 12 +- .../room/models/CfgBedTypeMappingView.java | 9 +- .../room/models/CfgOtherRoomStatus.java | 9 +- .../room/models/CfgRoomFeatures.java | 11 +- .../basesetting/room/models/CfgRoomTypes.java | 11 +- .../basesetting/room/models/CfgRooms.java | 13 +- .../room/models/CfgRoomsRoomTypes.java | 8 +- .../room/repositories/BedTypeMappingDao.java | 5 +- .../room/repositories/OtherRoomStatusDao.java | 5 +- .../room/repositories/RoomDao.java | 18 +- .../room/repositories/RoomFeatureDao.java | 5 +- .../room/repositories/RoomRoomTypeDao.java | 8 +- .../room/repositories/RoomTypeDao.java | 7 +- .../room/services/OtherRoomStatusService.java | 5 +- .../basesetting/team/models/AppUsers.java | 19 +- .../team/models/CfgDepartments.java | 9 +- .../basesetting/team/models/CfgDivisions.java | 9 +- .../team/models/CfgOtherUserMapping.java | 9 +- .../basesetting/team/models/CfgSections.java | 9 +- .../team/models/CfgTeamStructure.java | 9 +- .../team/models/CfgTeamStructureView.java | 20 +- .../team/repositories/AppUserDao.java | 5 +- .../team/repositories/DepartmentDao.java | 5 +- .../team/repositories/DivisionDao.java | 5 +- .../repositories/OtherUserMappingDao.java | 5 +- .../team/repositories/SectionDao.java | 5 +- .../team/repositories/TeamStructureDao.java | 5 +- .../repositories/TeamStructureViewDao.java | 6 +- .../controllers/BookingController.java | 47 ++--- .../controllers/WaitlistController.java | 12 +- .../mcrm/booking/dtos/daylight/Breakdown.java | 1 - .../dtos/opera/CancelBookingRequest.java | 2 - .../dtos/opera/CancelBookingResponse.java | 3 +- .../dtos/opera/CombineShareRequest.java | 4 +- .../dtos/opera/CombineShareResponse.java | 4 +- .../dtos/opera/CreateBookingRequest.java | 10 +- .../dtos/opera/CreateBookingResponse.java | 4 +- .../CreateBookingRoomTypeDescription.java | 3 - .../dtos/opera/CreateBookingUniqueIDList.java | 4 +- .../opera/FetchBookingAdditionalDetail.java | 3 - ...tchBookingAdditionalDetailDescription.java | 3 - .../opera/FetchBookingAdditionalDetails.java | 4 +- .../opera/FetchBookingArrivalTransport.java | 3 - .../dtos/opera/FetchBookingCancelTerm.java | 4 - .../dtos/opera/FetchBookingComment.java | 3 - .../dtos/opera/FetchBookingComments.java | 4 +- .../dtos/opera/FetchBookingCompany.java | 3 - .../opera/FetchBookingDepartureTransport.java | 4 - .../opera/FetchBookingExpectedCharges.java | 4 +- .../dtos/opera/FetchBookingGuarantee.java | 4 - .../dtos/opera/FetchBookingGuestCount.java | 3 - .../dtos/opera/FetchBookingGuestCounts.java | 4 +- .../dtos/opera/FetchBookingNameAddress.java | 3 - .../opera/FetchBookingNameMembership.java | 3 - .../dtos/opera/FetchBookingNamePhone.java | 3 - .../dtos/opera/FetchBookingOtherPayment.java | 4 - .../dtos/opera/FetchBookingPersonName.java | 3 - .../dtos/opera/FetchBookingPhones.java | 4 +- .../dtos/opera/FetchBookingProfileIDs.java | 3 - .../dtos/opera/FetchBookingProfiles.java | 4 +- .../FetchBookingRatePlanDescription.java | 3 - .../dtos/opera/FetchBookingResGuestRPH.java | 3 - .../FetchBookingReservationGuarantee.java | 4 - .../opera/FetchBookingReservationHistory.java | 3 - .../FetchBookingReservationPaymentInfo.java | 4 - .../dtos/opera/FetchBookingResponse.java | 4 +- .../FetchBookingRoomRateAndPackages.java | 4 +- .../dtos/opera/FetchBookingRoomRates.java | 4 +- .../FetchBookingRoomToChargeDescription.java | 3 - ...chBookingRoomToChargeShortDescription.java | 3 - .../FetchBookingRoomTypeDescription.java | 3 - .../FetchBookingRoomTypeShortDescription.java | 3 - .../opera/FetchBookingShareReservations.java | 4 +- .../dtos/opera/FetchBookingTaxesAndFees.java | 4 +- .../booking/dtos/opera/FetchBookingText.java | 3 - .../dtos/opera/FetchBookingTimeSpan.java | 3 - .../dtos/opera/FetchBookingUniqueIDList.java | 4 +- .../opera/FetchBookingUserDefinedValue.java | 4 - .../opera/FetchBookingUserDefinedValues.java | 4 +- .../dtos/opera/GuestRequestsRequest.java | 22 +-- .../dtos/opera/GuestRequestsResponse.java | 4 +- .../dtos/opera/InsertGuestCardRequest.java | 2 - .../dtos/opera/InsertGuestCardResponse.java | 3 +- .../dtos/opera/ModifyBookingRequest.java | 3 +- .../dtos/opera/UpdatePassportRequest.java | 2 - .../dtos/opera/UpdatePassportResponse.java | 3 +- .../dtos/opera/schema/GuestRequest.java | 3 +- .../dtos/opera/schema/GuestRequestMsg.java | 4 +- .../search/GetBookingByNameIdRequest.java | 1 - .../com/mgm/mcrm/booking/models/Bookings.java | 15 +- .../mgm/mcrm/booking/models/BookingsView.java | 24 +-- .../mcrm/booking/models/CfgBookingTypes.java | 9 +- .../mgm/mcrm/booking/models/GamingData.java | 9 +- .../mcrm/booking/models/NonMGMBookings.java | 9 +- .../mcrm/booking/models/OWSTransactions.java | 14 +- .../mcrm/booking/models/OperaDBBooking.java | 4 +- .../mcrm/booking/repositories/BookingDao.java | 9 +- .../booking/repositories/BookingTypeDao.java | 6 +- .../booking/repositories/BookingViewDao.java | 6 +- .../booking/repositories/GamingDataDao.java | 7 +- .../repositories/NonMGMBookingDao.java | 7 +- .../repositories/NonMGMStatusMappingDao.java | 5 +- .../OWSTransactionsRepository.java | 2 +- .../repositories/OtherAppChannelDao.java | 3 - .../repositories/OtherFollowUpStatusDao.java | 5 +- .../mcrm/booking/services/BookingService.java | 36 ++-- .../services/NonMGMBookingService.java | 62 +++--- .../services/OWSTransactionsService.java | 6 +- .../services/OperaDBBookingService.java | 9 +- .../mcrm/booking/services/OperaService.java | 59 ++---- .../services/WaitlistBookingService.java | 52 +++-- .../mcrm/common/config/DataSourceConfig.java | 4 +- .../com/mgm/mcrm/common/config/JMSConfig.java | 6 +- .../common/config/MGMDataSourceConfig.java | 6 +- .../common/config/OperaDataSourceConfig.java | 7 +- .../mgm/mcrm/common/constants/SysCommon.java | 50 ++--- .../mcrm/common/constants/SysConstants.java | 2 - .../common/dtos/excel_model/RowFieldInfo.java | 4 +- .../dtos/http_util/HttpRequestDefine.java | 4 +- .../dtos/mgm_api/PlayerTPDApiResult.java | 7 +- .../dtos/mgm_api/TodoDetailDescription.java | 9 + .../common/dtos/mgm_api/TodoDetailResult.java | 5 +- .../mcrm/common/dtos/system/RouterPages.java | 1 - .../common/httpclient/HttpClientExecutor.java | 6 +- .../interceptor/ControllerLogAspector.java | 18 +- .../common/jms/AppControlMsgConsumer.java | 13 +- .../mcrm/common/jms/AppControlMsgSender.java | 8 +- .../common/jms/BookingControlMsgConsumer.java | 11 +- .../common/jms/BookingControlMsgSender.java | 8 +- .../mcrm/common/listener/ConfigListener.java | 18 +- .../common/schedule/AppSystemScheduleJob.java | 5 +- .../common/schedule/BookingScheduleJob.java | 20 +- .../mcrm/common/services/MGMApiService.java | 30 ++- .../services/SysServerStateService.java | 7 +- .../com/mgm/mcrm/common/utils/ADFSUtil.java | 21 +- .../com/mgm/mcrm/common/utils/AESUtil.java | 11 +- .../com/mgm/mcrm/common/utils/DaoUtil.java | 9 +- .../mgm/mcrm/common/utils/DateTimeUtil.java | 12 +- .../mgm/mcrm/common/utils/EncryptUtil.java | 4 +- .../com/mgm/mcrm/common/utils/ExcelUtils.java | 68 ++----- .../com/mgm/mcrm/common/utils/HttpUtil.java | 31 ++- .../com/mgm/mcrm/common/utils/LogUtil.java | 5 +- .../com/mgm/mcrm/common/utils/MailConfig.java | 13 -- .../utils/MessageReceiverListenerImpl.java | 6 +- .../mgm/mcrm/common/utils/NetworkUtil.java | 17 +- .../com/mgm/mcrm/common/utils/PDFUtil.java | 6 +- .../com/mgm/mcrm/common/utils/SOAPUtil.java | 46 ++--- .../com/mgm/mcrm/common/utils/SendEmail.java | 20 +- .../common/utils/mockup/AjaxResultMockup.java | 11 +- .../common/utils/mockup/HttpUtilMockup.java | 17 +- .../controllers/SysLogAppController.java | 14 +- .../controllers/SysLogConfirmController.java | 9 +- .../mgm/mcrm/logging/models/SysLogApp.java | 9 +- .../mcrm/logging/models/SysLogBooking.java | 9 +- .../mgm/mcrm/logging/models/SysLogETA.java | 1 + .../mgm/mcrm/logging/models/SysLogLogin.java | 9 +- .../mcrm/logging/models/SysLogLoginIp.java | 1 + .../logging/models/SysLogMobileConfirm.java | 9 +- .../mcrm/logging/models/SysLogOperation.java | 9 +- .../logging/repositories/SysLogAppDao.java | 5 +- .../repositories/SysLogBookingDao.java | 5 +- .../repositories/SysLogConfirmDao.java | 5 +- .../logging/repositories/SysLogETADao.java | 4 +- .../logging/repositories/SysLogLoginDao.java | 7 +- .../repositories/SysLogLoginIpDao.java | 2 +- .../repositories/SysLogOperationDao.java | 7 +- .../logging/services/SysLogAppService.java | 5 +- .../services/SysLogBookingService.java | 26 ++- .../services/SysLogConfirmService.java | 8 +- .../services/SysLogDeviceTokenService.java | 1 - .../logging/services/SysLogETAService.java | 3 +- .../services/SysLogLoginIpService.java | 5 +- .../logging/services/SysLogLoginService.java | 5 +- .../services/SysLogOperationService.java | 5 +- .../controllers/EmailTemplateController.java | 6 +- .../notification/models/CfgEmailTemplate.java | 10 +- .../mgm/mcrm/notification/models/Email.java | 9 +- .../notification/repositories/EmailDao.java | 5 +- .../repositories/EmailTemplateDao.java | 7 +- .../services/ApnNotificationService.java | 2 +- .../services/EmailTemplateService.java | 49 +++-- .../player/controllers/PlayerController.java | 12 +- .../player/controllers/TodoController.java | 16 +- .../response/ReservationResultResponse.java | 2 - .../mgm/mcrm/player/services/TodoService.java | 181 +++++++++++++----- .../controllers/RoomCalendarController.java | 6 +- .../services/CalendarMockData.java | 5 +- .../services/RoomCalendarService.java | 56 ++++-- .../mcrm/PublicEndpointsMigrationTest.java | 2 + .../mgm/mcrm/RefreshTokenMigrationTest.java | 14 +- .../com/mgm/mcrm/TodoIrcMigrationTest.java | 3 +- .../mgm/mcrm/TodoNumericMigrationTest.java | 1 + .../mgm/mcrm/TodoRemainingContractTest.java | 21 +- .../CalendarBootstrapMigrationTest.java | 18 +- .../roomcalendar/CalendarMockDataTest.java | 7 +- .../CalendarQueryMigrationTest.java | 7 +- 282 files changed, 1193 insertions(+), 1760 deletions(-) diff --git a/src/main/java/com/mgm/mcrm/adfs/controllers/SSOCallbackController.java b/src/main/java/com/mgm/mcrm/adfs/controllers/SSOCallbackController.java index 6bd5949..e9d92eb 100644 --- a/src/main/java/com/mgm/mcrm/adfs/controllers/SSOCallbackController.java +++ b/src/main/java/com/mgm/mcrm/adfs/controllers/SSOCallbackController.java @@ -1,15 +1,14 @@ package com.mgm.mcrm.adfs.controllers; -import java.io.IOException; -import java.io.PrintWriter; - import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; - import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import java.io.IOException; +import java.io.PrintWriter; + //@RequestMapping("/sso_callback") @Controller public class SSOCallbackController { diff --git a/src/main/java/com/mgm/mcrm/adfs/controllers/SSORestProcessController.java b/src/main/java/com/mgm/mcrm/adfs/controllers/SSORestProcessController.java index 0f0f1ff..d3bf33c 100644 --- a/src/main/java/com/mgm/mcrm/adfs/controllers/SSORestProcessController.java +++ b/src/main/java/com/mgm/mcrm/adfs/controllers/SSORestProcessController.java @@ -1,34 +1,25 @@ package com.mgm.mcrm.adfs.controllers; -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.net.InetAddress; -import java.net.URI; -import java.net.URLEncoder; -import java.net.UnknownHostException; -import java.nio.charset.StandardCharsets; -import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import com.mgm.mcrm.adfs.config.HttpClientContextRequestFactory; +import com.mgm.mcrm.common.constants.SysCommon; +import com.mgm.mcrm.common.utils.AESUtil; +import com.mgm.mcrm.common.utils.LogUtil; +import com.mgm.mcrm.common.utils.NetworkUtil; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Strings; -import org.apache.hc.client5.http.auth.*; +import org.apache.hc.client5.http.auth.AuthScope; +import org.apache.hc.client5.http.auth.Credentials; +import org.apache.hc.client5.http.auth.NTCredentials; import org.apache.hc.client5.http.config.RequestConfig; -import org.apache.hc.client5.http.cookie.*; +import org.apache.hc.client5.http.cookie.BasicCookieStore; +import org.apache.hc.client5.http.cookie.Cookie; +import org.apache.hc.client5.http.cookie.CookieStore; +import org.apache.hc.client5.http.cookie.StandardCookieSpec; import org.apache.hc.client5.http.entity.UrlEncodedFormEntity; import org.apache.hc.client5.http.impl.DefaultRedirectStrategy; -import org.apache.hc.client5.http.impl.auth.*; +import org.apache.hc.client5.http.impl.auth.SystemDefaultCredentialsProvider; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.apache.hc.client5.http.impl.classic.HttpClients; @@ -53,12 +44,16 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.util.HtmlUtils; -import com.mgm.mcrm.common.constants.SysCommon; -import com.mgm.mcrm.common.utils.AESUtil; -import com.mgm.mcrm.common.utils.LogUtil; -import com.mgm.mcrm.common.utils.NetworkUtil; - import javax.net.ssl.SSLContext; +import java.io.*; +import java.net.InetAddress; +import java.net.URI; +import java.net.URLEncoder; +import java.net.UnknownHostException; +import java.nio.charset.StandardCharsets; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; @Controller diff --git a/src/main/java/com/mgm/mcrm/allotment/models/CfgAppChannel.java b/src/main/java/com/mgm/mcrm/allotment/models/CfgAppChannel.java index 07ca560..d6b0bbe 100644 --- a/src/main/java/com/mgm/mcrm/allotment/models/CfgAppChannel.java +++ b/src/main/java/com/mgm/mcrm/allotment/models/CfgAppChannel.java @@ -1,15 +1,10 @@ package com.mgm.mcrm.allotment.models; -import java.io.Serializable; -import java.util.Date; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.IdClass; -import jakarta.persistence.Table; +import jakarta.persistence.*; import lombok.Data; +import java.util.Date; + @Data @Entity @Table(name="cfg_app_channel") diff --git a/src/main/java/com/mgm/mcrm/allotment/models/CfgOtherAllotment.java b/src/main/java/com/mgm/mcrm/allotment/models/CfgOtherAllotment.java index ddd6d92..412251b 100644 --- a/src/main/java/com/mgm/mcrm/allotment/models/CfgOtherAllotment.java +++ b/src/main/java/com/mgm/mcrm/allotment/models/CfgOtherAllotment.java @@ -1,15 +1,14 @@ package com.mgm.mcrm.allotment.models; +import com.mgm.mcrm.basesetting.daylight.models.CfgOtherSegment; +import jakarta.persistence.*; + import java.io.Serializable; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Set; -import jakarta.persistence.*; - -import com.mgm.mcrm.basesetting.daylight.models.CfgOtherSegment; - @Entity @Table(name="cfg_other_allotment") public class CfgOtherAllotment implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/allotment/models/CfgOtherAllotmentView.java b/src/main/java/com/mgm/mcrm/allotment/models/CfgOtherAllotmentView.java index 4bf1daf..c45bd14 100644 --- a/src/main/java/com/mgm/mcrm/allotment/models/CfgOtherAllotmentView.java +++ b/src/main/java/com/mgm/mcrm/allotment/models/CfgOtherAllotmentView.java @@ -1,19 +1,18 @@ package com.mgm.mcrm.allotment.models; +import com.mgm.mcrm.basesetting.daylight.models.CfgOtherSegment; +import com.mgm.mcrm.basesetting.property.models.CfgProperties; +import com.mgm.mcrm.basesetting.room.models.CfgRoomTypes; +import com.mgm.mcrm.basesetting.room.models.CfgRooms; +import jakarta.persistence.*; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import java.io.Serializable; import java.util.Date; import java.util.List; import java.util.Set; -import com.mgm.mcrm.basesetting.property.models.CfgProperties; -import com.mgm.mcrm.basesetting.room.models.CfgRoomTypes; -import com.mgm.mcrm.basesetting.room.models.CfgRooms; -import jakarta.persistence.*; - -import org.hibernate.annotations.NotFound; -import org.hibernate.annotations.NotFoundAction; -import com.mgm.mcrm.basesetting.daylight.models.CfgOtherSegment; - @Entity @Table(name="cfg_other_allotment") @NamedEntityGraphs({ diff --git a/src/main/java/com/mgm/mcrm/allotment/models/CfgOtherAppChannel.java b/src/main/java/com/mgm/mcrm/allotment/models/CfgOtherAppChannel.java index 2b02661..2244904 100644 --- a/src/main/java/com/mgm/mcrm/allotment/models/CfgOtherAppChannel.java +++ b/src/main/java/com/mgm/mcrm/allotment/models/CfgOtherAppChannel.java @@ -1,14 +1,10 @@ package com.mgm.mcrm.allotment.models; +import jakarta.persistence.*; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.IdClass; -import jakarta.persistence.Table; - @Entity @Table(name="cfg_other_app_channel") @IdClass(CfgOtherAppChannelKey.class) diff --git a/src/main/java/com/mgm/mcrm/allotment/models/CfgRoomCriterias.java b/src/main/java/com/mgm/mcrm/allotment/models/CfgRoomCriterias.java index 8e345ed..15b9e3c 100644 --- a/src/main/java/com/mgm/mcrm/allotment/models/CfgRoomCriterias.java +++ b/src/main/java/com/mgm/mcrm/allotment/models/CfgRoomCriterias.java @@ -1,35 +1,20 @@ package com.mgm.mcrm.allotment.models; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.mgm.mcrm.basesetting.property.models.CfgBlocks; +import com.mgm.mcrm.basesetting.property.models.CfgProperties; +import com.mgm.mcrm.basesetting.room.models.CfgRoomTypes; +import com.mgm.mcrm.basesetting.room.models.CfgRooms; +import jakarta.persistence.*; +import lombok.Data; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import java.io.Serializable; import java.util.Date; import java.util.List; import java.util.Set; -import com.mgm.mcrm.basesetting.daylight.models.CfgBlockCodes; -import com.mgm.mcrm.basesetting.property.models.CfgProperties; -import com.mgm.mcrm.basesetting.room.models.CfgRoomTypes; -import com.mgm.mcrm.basesetting.room.models.CfgRooms; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.JoinTable; -import jakarta.persistence.ManyToMany; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToMany; -import jakarta.persistence.Table; -import jakarta.persistence.Transient; - -import lombok.Data; -import org.hibernate.annotations.NotFound; -import org.hibernate.annotations.NotFoundAction; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.mgm.mcrm.basesetting.property.models.CfgBlocks; - @Entity @Data @Table(name="cfg_room_criterias") diff --git a/src/main/java/com/mgm/mcrm/allotment/repositories/AppChannelDao.java b/src/main/java/com/mgm/mcrm/allotment/repositories/AppChannelDao.java index 884653f..c294199 100644 --- a/src/main/java/com/mgm/mcrm/allotment/repositories/AppChannelDao.java +++ b/src/main/java/com/mgm/mcrm/allotment/repositories/AppChannelDao.java @@ -1,13 +1,10 @@ package com.mgm.mcrm.allotment.repositories; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.transaction.annotation.Transactional; - import com.mgm.mcrm.allotment.models.CfgAppChannel; +import com.mgm.mcrm.allotment.models.CfgAppChannelKey; +import org.springframework.data.jpa.repository.JpaRepository; -public interface AppChannelDao extends JpaRepository { +public interface AppChannelDao extends JpaRepository { } diff --git a/src/main/java/com/mgm/mcrm/allotment/repositories/OtherAllotmentDao.java b/src/main/java/com/mgm/mcrm/allotment/repositories/OtherAllotmentDao.java index 4ea2e46..0e39885 100644 --- a/src/main/java/com/mgm/mcrm/allotment/repositories/OtherAllotmentDao.java +++ b/src/main/java/com/mgm/mcrm/allotment/repositories/OtherAllotmentDao.java @@ -1,16 +1,14 @@ package com.mgm.mcrm.allotment.repositories; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - +import com.mgm.mcrm.allotment.models.CfgOtherAllotment; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import com.mgm.mcrm.allotment.models.CfgOtherAllotment; + +import java.util.Date; +import java.util.List; diff --git a/src/main/java/com/mgm/mcrm/allotment/repositories/OtherAllotmentViewDao.java b/src/main/java/com/mgm/mcrm/allotment/repositories/OtherAllotmentViewDao.java index 36302e7..a30c305 100644 --- a/src/main/java/com/mgm/mcrm/allotment/repositories/OtherAllotmentViewDao.java +++ b/src/main/java/com/mgm/mcrm/allotment/repositories/OtherAllotmentViewDao.java @@ -1,14 +1,15 @@ package com.mgm.mcrm.allotment.repositories; -import java.util.Date; -import java.util.List; +import com.mgm.mcrm.allotment.models.CfgOtherAllotmentView; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; -import com.mgm.mcrm.allotment.models.CfgOtherAllotmentView; + +import java.util.Date; +import java.util.List; public interface OtherAllotmentViewDao extends JpaRepository { @EntityGraph(value = "graph.OtherAllotment.fulldetails",type = EntityGraph.EntityGraphType.LOAD) diff --git a/src/main/java/com/mgm/mcrm/allotment/repositories/RoomCriteriaDao.java b/src/main/java/com/mgm/mcrm/allotment/repositories/RoomCriteriaDao.java index 9689403..a5e2a29 100644 --- a/src/main/java/com/mgm/mcrm/allotment/repositories/RoomCriteriaDao.java +++ b/src/main/java/com/mgm/mcrm/allotment/repositories/RoomCriteriaDao.java @@ -1,8 +1,6 @@ package com.mgm.mcrm.allotment.repositories; -import java.util.Date; -import java.util.List; - +import com.mgm.mcrm.allotment.models.CfgRoomCriterias; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -12,11 +10,12 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; -import com.mgm.mcrm.allotment.models.CfgRoomCriterias; +import java.util.Date; +import java.util.List; -public interface RoomCriteriaDao extends JpaRepository { +public interface RoomCriteriaDao extends JpaRepository { CfgRoomCriterias findById(long id); List findAll(Specification spec,Sort sort); List findAll(Specification spec); diff --git a/src/main/java/com/mgm/mcrm/approval/controller/ApprovalController.java b/src/main/java/com/mgm/mcrm/approval/controller/ApprovalController.java index afd5315..37d019e 100644 --- a/src/main/java/com/mgm/mcrm/approval/controller/ApprovalController.java +++ b/src/main/java/com/mgm/mcrm/approval/controller/ApprovalController.java @@ -16,13 +16,11 @@ import com.mgm.mcrm.common.dtos.mgm_api.ApproverResult; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; -import org.apache.coyote.Response; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; - import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/src/main/java/com/mgm/mcrm/approval/service/ApprovalService.java b/src/main/java/com/mgm/mcrm/approval/service/ApprovalService.java index 91da719..e4bf0e4 100644 --- a/src/main/java/com/mgm/mcrm/approval/service/ApprovalService.java +++ b/src/main/java/com/mgm/mcrm/approval/service/ApprovalService.java @@ -49,7 +49,10 @@ import com.mgm.mcrm.common.constants.SysConstants; import com.mgm.mcrm.common.dtos.BaseApiResponse; import com.mgm.mcrm.common.dtos.EumnApprovalStatus; import com.mgm.mcrm.common.dtos.http_util.HttpResponseResult; -import com.mgm.mcrm.common.dtos.mgm_api.*; +import com.mgm.mcrm.common.dtos.mgm_api.ApprovalGamingDataResult; +import com.mgm.mcrm.common.dtos.mgm_api.ApproverResult; +import com.mgm.mcrm.common.dtos.mgm_api.PlayerProfileEntry; +import com.mgm.mcrm.common.dtos.mgm_api.UserInfoApiRecord; import com.mgm.mcrm.common.jms.BookingControlMsgSender; import com.mgm.mcrm.common.services.MGMApiService; import com.mgm.mcrm.common.utils.DateTimeUtil; @@ -71,7 +74,6 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.RequestBody; import java.text.SimpleDateFormat; import java.time.LocalDate; diff --git a/src/main/java/com/mgm/mcrm/appsetting/controllers/CfgSettingController.java b/src/main/java/com/mgm/mcrm/appsetting/controllers/CfgSettingController.java index 4483c9c..837a3d4 100644 --- a/src/main/java/com/mgm/mcrm/appsetting/controllers/CfgSettingController.java +++ b/src/main/java/com/mgm/mcrm/appsetting/controllers/CfgSettingController.java @@ -4,6 +4,7 @@ import com.mgm.mcrm.appsetting.dtos.CfgSettingQueryRequest; import com.mgm.mcrm.appsetting.dtos.SysSettingQueryRequest; import com.mgm.mcrm.appsetting.models.CfgSettings; import com.mgm.mcrm.appsetting.models.SysSetting; +import com.mgm.mcrm.appsetting.services.SettingService; import com.mgm.mcrm.appsetting.services.SysSettingService; import com.mgm.mcrm.common.dtos.BaseApiResponse; import com.mgm.mcrm.common.utils.LogUtil; @@ -13,11 +14,9 @@ import jakarta.servlet.http.HttpServletRequest; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import com.mgm.mcrm.appsetting.services.SettingService; -import java.util.List; import java.util.ArrayList; -import java.util.Map; +import java.util.List; @RestController diff --git a/src/main/java/com/mgm/mcrm/appsetting/controllers/ConfigController.java b/src/main/java/com/mgm/mcrm/appsetting/controllers/ConfigController.java index 7be5f38..27e69fc 100644 --- a/src/main/java/com/mgm/mcrm/appsetting/controllers/ConfigController.java +++ b/src/main/java/com/mgm/mcrm/appsetting/controllers/ConfigController.java @@ -1,30 +1,27 @@ package com.mgm.mcrm.appsetting.controllers; -import java.util.HashSet; -import java.util.List; -import java.util.Map; - +import com.alibaba.fastjson.JSONObject; import com.mgm.mcrm.appsetting.dtos.*; import com.mgm.mcrm.appsetting.models.CfgSettings; +import com.mgm.mcrm.appsetting.services.ConfigService; import com.mgm.mcrm.basesetting.property.models.CfgProperties; import com.mgm.mcrm.basesetting.room.models.CfgRoomFeatures; import com.mgm.mcrm.basesetting.room.models.CfgRoomTypes; import com.mgm.mcrm.basesetting.room.models.CfgRooms; +import com.mgm.mcrm.basesetting.room.repositories.BedTypeMappingDao.BedType; import com.mgm.mcrm.booking.models.Bookings; import com.mgm.mcrm.booking.models.CfgBookingTypes; import com.mgm.mcrm.common.dtos.BaseApiResponse; +import com.mgm.mcrm.common.utils.LogUtil; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; - import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import com.alibaba.fastjson.JSONObject; - -import com.mgm.mcrm.basesetting.room.repositories.BedTypeMappingDao.BedType; -import com.mgm.mcrm.appsetting.services.ConfigService; -import com.mgm.mcrm.common.utils.LogUtil; +import java.util.HashSet; +import java.util.List; +import java.util.Map; @RestController @CrossOrigin(origins = "*") diff --git a/src/main/java/com/mgm/mcrm/appsetting/dtos/AvailableRoomQueryRequest.java b/src/main/java/com/mgm/mcrm/appsetting/dtos/AvailableRoomQueryRequest.java index a9bbd3a..8b33408 100644 --- a/src/main/java/com/mgm/mcrm/appsetting/dtos/AvailableRoomQueryRequest.java +++ b/src/main/java/com/mgm/mcrm/appsetting/dtos/AvailableRoomQueryRequest.java @@ -1,11 +1,9 @@ package com.mgm.mcrm.appsetting.dtos; import com.mgm.mcrm.common.dtos.BaseQueryRequest; -import com.mgm.mcrm.common.utils.DateTimeUtil; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; import java.util.List; @EqualsAndHashCode(callSuper = true) diff --git a/src/main/java/com/mgm/mcrm/appsetting/dtos/ExtendBookingQueryRequest.java b/src/main/java/com/mgm/mcrm/appsetting/dtos/ExtendBookingQueryRequest.java index baefc64..1f0882e 100644 --- a/src/main/java/com/mgm/mcrm/appsetting/dtos/ExtendBookingQueryRequest.java +++ b/src/main/java/com/mgm/mcrm/appsetting/dtos/ExtendBookingQueryRequest.java @@ -1,13 +1,9 @@ package com.mgm.mcrm.appsetting.dtos; import com.mgm.mcrm.common.dtos.BaseQueryRequest; -import com.mgm.mcrm.common.utils.DateTimeUtil; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; -import java.util.List; - @EqualsAndHashCode(callSuper = true) @Data public class ExtendBookingQueryRequest extends BaseQueryRequest { diff --git a/src/main/java/com/mgm/mcrm/appsetting/dtos/RoomQueryRequest.java b/src/main/java/com/mgm/mcrm/appsetting/dtos/RoomQueryRequest.java index dca350f..c46e3d9 100644 --- a/src/main/java/com/mgm/mcrm/appsetting/dtos/RoomQueryRequest.java +++ b/src/main/java/com/mgm/mcrm/appsetting/dtos/RoomQueryRequest.java @@ -3,7 +3,6 @@ package com.mgm.mcrm.appsetting.dtos; import com.mgm.mcrm.common.dtos.BaseQueryRequest; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.commons.lang3.StringUtils; @EqualsAndHashCode(callSuper = true) @Data diff --git a/src/main/java/com/mgm/mcrm/appsetting/models/CfgSettings.java b/src/main/java/com/mgm/mcrm/appsetting/models/CfgSettings.java index 474c2b8..fa01283 100644 --- a/src/main/java/com/mgm/mcrm/appsetting/models/CfgSettings.java +++ b/src/main/java/com/mgm/mcrm/appsetting/models/CfgSettings.java @@ -1,11 +1,12 @@ package com.mgm.mcrm.appsetting.models; -import java.io.Serializable; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; +import java.io.Serializable; + @Entity @Table(name="cfg_settings")// public class CfgSettings implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/appsetting/models/SysSetting.java b/src/main/java/com/mgm/mcrm/appsetting/models/SysSetting.java index 4403b89..6a57798 100644 --- a/src/main/java/com/mgm/mcrm/appsetting/models/SysSetting.java +++ b/src/main/java/com/mgm/mcrm/appsetting/models/SysSetting.java @@ -1,12 +1,8 @@ package com.mgm.mcrm.appsetting.models; -import java.io.Serializable; +import jakarta.persistence.*; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import jakarta.persistence.Transient; +import java.io.Serializable; @Entity @Table(name="sys_settings") diff --git a/src/main/java/com/mgm/mcrm/appsetting/repositories/SettingDao.java b/src/main/java/com/mgm/mcrm/appsetting/repositories/SettingDao.java index edcac68..3da6f35 100644 --- a/src/main/java/com/mgm/mcrm/appsetting/repositories/SettingDao.java +++ b/src/main/java/com/mgm/mcrm/appsetting/repositories/SettingDao.java @@ -1,8 +1,8 @@ package com.mgm.mcrm.appsetting.repositories; +import com.mgm.mcrm.appsetting.models.CfgSettings; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; -import com.mgm.mcrm.appsetting.models.CfgSettings; public interface SettingDao extends JpaRepository { @Query(value = "select * from cfg_settings with (nolock) where keys = ?1",nativeQuery=true) diff --git a/src/main/java/com/mgm/mcrm/appsetting/repositories/SysSettingDao.java b/src/main/java/com/mgm/mcrm/appsetting/repositories/SysSettingDao.java index 747913d..acce997 100644 --- a/src/main/java/com/mgm/mcrm/appsetting/repositories/SysSettingDao.java +++ b/src/main/java/com/mgm/mcrm/appsetting/repositories/SysSettingDao.java @@ -1,13 +1,12 @@ package com.mgm.mcrm.appsetting.repositories; -import java.util.List; - +import com.mgm.mcrm.appsetting.models.SysSetting; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; -import com.mgm.mcrm.appsetting.models.SysSetting; +import java.util.List; public interface SysSettingDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/appsetting/services/ConfigService.java b/src/main/java/com/mgm/mcrm/appsetting/services/ConfigService.java index 61d5b56..c13ece2 100644 --- a/src/main/java/com/mgm/mcrm/appsetting/services/ConfigService.java +++ b/src/main/java/com/mgm/mcrm/appsetting/services/ConfigService.java @@ -1,19 +1,35 @@ package com.mgm.mcrm.appsetting.services; -import java.time.LocalDateTime; -import java.util.*; - +import com.alibaba.fastjson.JSONObject; import com.mgm.mcrm.allotment.models.*; +import com.mgm.mcrm.allotment.repositories.OtherAllotmentViewDao; +import com.mgm.mcrm.allotment.repositories.RoomCriteriaDao; import com.mgm.mcrm.allotment.repositories.RoomCriteriaDaylightDao; import com.mgm.mcrm.appsetting.dtos.*; +import com.mgm.mcrm.appsetting.models.CfgSettings; +import com.mgm.mcrm.appsetting.repositories.SettingDao; import com.mgm.mcrm.basesetting.daylight.models.*; import com.mgm.mcrm.basesetting.daylight.repositories.*; +import com.mgm.mcrm.basesetting.property.models.CfgProperties; +import com.mgm.mcrm.basesetting.property.repositories.PropertyDao; +import com.mgm.mcrm.basesetting.room.models.*; +import com.mgm.mcrm.basesetting.room.repositories.*; +import com.mgm.mcrm.basesetting.room.repositories.BedTypeMappingDao.BedType; +import com.mgm.mcrm.basesetting.team.models.CfgOtherUserMapping; +import com.mgm.mcrm.basesetting.team.repositories.OtherUserMappingDao; +import com.mgm.mcrm.booking.models.Bookings; import com.mgm.mcrm.booking.models.BookingsView; +import com.mgm.mcrm.booking.models.CfgBookingTypes; +import com.mgm.mcrm.booking.repositories.BookingDao; +import com.mgm.mcrm.booking.repositories.BookingTypeDao; +import com.mgm.mcrm.booking.repositories.BookingViewDao; +import com.mgm.mcrm.booking.services.WaitlistBookingService; +import com.mgm.mcrm.common.constants.SysConstants; +import com.mgm.mcrm.common.utils.DaoUtil; +import com.mgm.mcrm.common.utils.DateTimeUtil; import jakarta.annotation.Resource; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Predicate; -import jakarta.persistence.criteria.Root; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Strings; import org.springframework.beans.factory.annotation.Autowired; @@ -22,36 +38,8 @@ import org.springframework.data.domain.Sort.Direction; import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; -import com.alibaba.fastjson.JSONObject; -import com.mgm.mcrm.booking.models.Bookings; -import com.mgm.mcrm.basesetting.room.models.CfgBedTypeMapping; -import com.mgm.mcrm.booking.models.CfgBookingTypes; -import com.mgm.mcrm.basesetting.team.models.CfgOtherUserMapping; -import com.mgm.mcrm.basesetting.property.models.CfgProperties; -import com.mgm.mcrm.basesetting.room.models.CfgRoomFeatures; -import com.mgm.mcrm.basesetting.room.models.CfgRoomTypes; -import com.mgm.mcrm.basesetting.room.models.CfgRooms; -import com.mgm.mcrm.basesetting.room.models.CfgRoomsRoomTypes; -import com.mgm.mcrm.appsetting.models.CfgSettings; -import com.mgm.mcrm.common.utils.DaoUtil; -import com.mgm.mcrm.common.utils.DateTimeUtil; -import com.mgm.mcrm.common.constants.SysConstants; -import com.mgm.mcrm.basesetting.room.repositories.BedTypeMappingDao; -import com.mgm.mcrm.allotment.repositories.OtherAllotmentViewDao; -import com.mgm.mcrm.basesetting.team.repositories.OtherUserMappingDao; -import com.mgm.mcrm.basesetting.property.repositories.PropertyDao; -import com.mgm.mcrm.allotment.repositories.RoomCriteriaDao; -import com.mgm.mcrm.basesetting.room.repositories.RoomDao; -import com.mgm.mcrm.basesetting.room.repositories.RoomFeatureDao; -import com.mgm.mcrm.basesetting.room.repositories.RoomRoomTypeDao; -import com.mgm.mcrm.basesetting.room.repositories.RoomTypeDao; -import com.mgm.mcrm.appsetting.repositories.SettingDao; -import com.mgm.mcrm.booking.repositories.BookingDao; -import com.mgm.mcrm.booking.repositories.BookingTypeDao; -import com.mgm.mcrm.booking.repositories.BookingViewDao; -import com.mgm.mcrm.basesetting.room.repositories.BedTypeMappingDao.BedType; -import com.mgm.mcrm.booking.services.WaitlistBookingService; -import lombok.extern.slf4j.Slf4j; +import java.time.LocalDateTime; +import java.util.*; @Slf4j @Service @@ -229,7 +217,7 @@ public class ConfigService { //check opera criteria or other criteria CfgProperties property = propertyDao.getById(propertyId); - CfgRooms room = roomDao.findById(roomId); + CfgRooms room = roomDao.findById(roomId).orElse(null); boolean isOpera = false; boolean isWaitlist = false; boolean isDaylight = false; diff --git a/src/main/java/com/mgm/mcrm/appsetting/services/SettingService.java b/src/main/java/com/mgm/mcrm/appsetting/services/SettingService.java index 918bc5e..e233d29 100644 --- a/src/main/java/com/mgm/mcrm/appsetting/services/SettingService.java +++ b/src/main/java/com/mgm/mcrm/appsetting/services/SettingService.java @@ -1,13 +1,13 @@ package com.mgm.mcrm.appsetting.services; -import java.util.List; -import java.util.ArrayList; -import org.apache.commons.lang3.Strings; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - import com.mgm.mcrm.appsetting.models.CfgSettings; import com.mgm.mcrm.appsetting.repositories.SettingDao; +import jakarta.annotation.Resource; +import org.apache.commons.lang3.Strings; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; @Service public class SettingService { diff --git a/src/main/java/com/mgm/mcrm/appsetting/services/SysSettingService.java b/src/main/java/com/mgm/mcrm/appsetting/services/SysSettingService.java index edb37db..0440938 100644 --- a/src/main/java/com/mgm/mcrm/appsetting/services/SysSettingService.java +++ b/src/main/java/com/mgm/mcrm/appsetting/services/SysSettingService.java @@ -1,13 +1,12 @@ package com.mgm.mcrm.appsetting.services; -import java.util.List; - +import com.mgm.mcrm.appsetting.models.SysSetting; +import com.mgm.mcrm.appsetting.repositories.SysSettingDao; import jakarta.annotation.Resource; import org.apache.commons.lang3.Strings; import org.springframework.stereotype.Service; -import com.mgm.mcrm.appsetting.models.SysSetting; -import com.mgm.mcrm.appsetting.repositories.SysSettingDao; +import java.util.List; @Service public class SysSettingService { diff --git a/src/main/java/com/mgm/mcrm/authorization/controllers/MobileLoginController.java b/src/main/java/com/mgm/mcrm/authorization/controllers/MobileLoginController.java index c059c7f..ab92c38 100644 --- a/src/main/java/com/mgm/mcrm/authorization/controllers/MobileLoginController.java +++ b/src/main/java/com/mgm/mcrm/authorization/controllers/MobileLoginController.java @@ -1,24 +1,33 @@ package com.mgm.mcrm.authorization.controllers; -import java.io.IOException; -import java.util.HashMap; -import java.util.List; - +import com.auth0.jwt.JWT; +import com.mgm.mcrm.appsetting.models.CfgSettings; +import com.mgm.mcrm.appsetting.services.SettingService; import com.mgm.mcrm.authorization.dtos.*; import com.mgm.mcrm.authorization.models.SysGroup; import com.mgm.mcrm.authorization.models.SysRouterPermission; import com.mgm.mcrm.authorization.models.Token; -import com.mgm.mcrm.authorization.services.*; +import com.mgm.mcrm.authorization.repositories.SysGroupDao; +import com.mgm.mcrm.authorization.services.AuthorizationService; +import com.mgm.mcrm.authorization.services.MgmUserService; +import com.mgm.mcrm.authorization.services.SysGroupPermissionService; +import com.mgm.mcrm.authorization.services.UserTokenService; import com.mgm.mcrm.authorization.utils.JwtTokenUtil; import com.mgm.mcrm.basesetting.team.models.CfgSections; import com.mgm.mcrm.basesetting.team.repositories.SectionDao; +import com.mgm.mcrm.common.constants.SysCommon; +import com.mgm.mcrm.common.constants.SysConstants; import com.mgm.mcrm.common.dtos.BaseApiResponse; -import com.mgm.mcrm.common.utils.*; +import com.mgm.mcrm.common.dtos.mgm_api.CheckApproverResult; +import com.mgm.mcrm.common.dtos.mgm_api.UserInfoApiRecord; +import com.mgm.mcrm.common.utils.ADFSUtil; +import com.mgm.mcrm.common.utils.EncryptUtil; +import com.mgm.mcrm.common.utils.LogUtil; +import com.mgm.mcrm.common.utils.NetworkUtil; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; - import jakarta.validation.Valid; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.util.Base64Util; @@ -26,15 +35,9 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import com.auth0.jwt.JWT; - -import com.mgm.mcrm.common.constants.SysCommon; -import com.mgm.mcrm.common.constants.SysConstants; -import com.mgm.mcrm.authorization.repositories.SysGroupDao; -import com.mgm.mcrm.appsetting.models.CfgSettings; -import com.mgm.mcrm.common.dtos.mgm_api.CheckApproverResult; -import com.mgm.mcrm.common.dtos.mgm_api.UserInfoApiRecord; -import com.mgm.mcrm.appsetting.services.SettingService; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; @Tag(name = "Authorization", description = "APIs for Authorization functions") @RestController diff --git a/src/main/java/com/mgm/mcrm/authorization/dtos/LoginInfo.java b/src/main/java/com/mgm/mcrm/authorization/dtos/LoginInfo.java index 6eb9d30..0074261 100644 --- a/src/main/java/com/mgm/mcrm/authorization/dtos/LoginInfo.java +++ b/src/main/java/com/mgm/mcrm/authorization/dtos/LoginInfo.java @@ -1,14 +1,14 @@ package com.mgm.mcrm.authorization.dtos; -import java.sql.Date; -import java.util.List; - import com.mgm.mcrm.authorization.models.SysRouter; import com.mgm.mcrm.authorization.models.SysRouterPermission; import com.mgm.mcrm.authorization.models.SysUserSetting; import com.mgm.mcrm.authorization.models.SysUserView; import lombok.Data; +import java.sql.Date; +import java.util.List; + @Data public class LoginInfo { private SysUserView loginUser; diff --git a/src/main/java/com/mgm/mcrm/authorization/filters/JwtAuthFilter.java b/src/main/java/com/mgm/mcrm/authorization/filters/JwtAuthFilter.java index fe7df16..955ac77 100644 --- a/src/main/java/com/mgm/mcrm/authorization/filters/JwtAuthFilter.java +++ b/src/main/java/com/mgm/mcrm/authorization/filters/JwtAuthFilter.java @@ -10,7 +10,6 @@ import com.mgm.mcrm.authorization.dtos.LoginUserInfo; import com.mgm.mcrm.authorization.models.Token; import com.mgm.mcrm.authorization.services.UserTokenService; import com.mgm.mcrm.authorization.utils.JwtTokenUtil; -import com.mgm.mcrm.common.constants.SysCommon; import com.mgm.mcrm.common.constants.SysConstants; import com.mgm.mcrm.common.utils.EncryptUtil; import com.mgm.mcrm.common.utils.LogUtil; diff --git a/src/main/java/com/mgm/mcrm/authorization/models/SysGroup.java b/src/main/java/com/mgm/mcrm/authorization/models/SysGroup.java index 5badafc..431c2b9 100644 --- a/src/main/java/com/mgm/mcrm/authorization/models/SysGroup.java +++ b/src/main/java/com/mgm/mcrm/authorization/models/SysGroup.java @@ -1,19 +1,13 @@ package com.mgm.mcrm.authorization.models; -import java.io.Serializable; -import java.util.Date; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - +import jakarta.persistence.*; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.io.Serializable; +import java.util.Date; + @Getter @Setter @NoArgsConstructor diff --git a/src/main/java/com/mgm/mcrm/authorization/models/SysGroupDataPermission.java b/src/main/java/com/mgm/mcrm/authorization/models/SysGroupDataPermission.java index 90a1db5..02b87a6 100644 --- a/src/main/java/com/mgm/mcrm/authorization/models/SysGroupDataPermission.java +++ b/src/main/java/com/mgm/mcrm/authorization/models/SysGroupDataPermission.java @@ -1,12 +1,6 @@ package com.mgm.mcrm.authorization.models; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - +import jakarta.persistence.*; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/mgm/mcrm/authorization/models/SysGroupPermission.java b/src/main/java/com/mgm/mcrm/authorization/models/SysGroupPermission.java index 7875e2f..a61c06c 100644 --- a/src/main/java/com/mgm/mcrm/authorization/models/SysGroupPermission.java +++ b/src/main/java/com/mgm/mcrm/authorization/models/SysGroupPermission.java @@ -1,11 +1,6 @@ package com.mgm.mcrm.authorization.models; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.IdClass; -import jakarta.persistence.Table; - +import jakarta.persistence.*; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/mgm/mcrm/authorization/models/SysRouter.java b/src/main/java/com/mgm/mcrm/authorization/models/SysRouter.java index 2daa30b..364f83a 100644 --- a/src/main/java/com/mgm/mcrm/authorization/models/SysRouter.java +++ b/src/main/java/com/mgm/mcrm/authorization/models/SysRouter.java @@ -1,24 +1,13 @@ package com.mgm.mcrm.authorization.models; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import jakarta.persistence.Transient; - +import com.fasterxml.jackson.annotation.JsonInclude; +import jakarta.persistence.*; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Parameter; -import com.fasterxml.jackson.annotation.JsonInclude; +import java.util.Date; +import java.util.List; @Getter @Setter diff --git a/src/main/java/com/mgm/mcrm/authorization/models/SysRouterPermission.java b/src/main/java/com/mgm/mcrm/authorization/models/SysRouterPermission.java index 6585a11..0914fd3 100644 --- a/src/main/java/com/mgm/mcrm/authorization/models/SysRouterPermission.java +++ b/src/main/java/com/mgm/mcrm/authorization/models/SysRouterPermission.java @@ -1,10 +1,6 @@ package com.mgm.mcrm.authorization.models; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import jakarta.persistence.Transient; +import jakarta.persistence.*; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/mgm/mcrm/authorization/models/SysUser.java b/src/main/java/com/mgm/mcrm/authorization/models/SysUser.java index e79b67f..b13c5fe 100644 --- a/src/main/java/com/mgm/mcrm/authorization/models/SysUser.java +++ b/src/main/java/com/mgm/mcrm/authorization/models/SysUser.java @@ -1,19 +1,12 @@ package com.mgm.mcrm.authorization.models; -import java.util.Date; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import jakarta.persistence.Transient; - +import jakarta.persistence.*; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.util.Date; + @Getter @Setter @NoArgsConstructor diff --git a/src/main/java/com/mgm/mcrm/authorization/models/SysUserSetting.java b/src/main/java/com/mgm/mcrm/authorization/models/SysUserSetting.java index 9b99690..f7c71ed 100644 --- a/src/main/java/com/mgm/mcrm/authorization/models/SysUserSetting.java +++ b/src/main/java/com/mgm/mcrm/authorization/models/SysUserSetting.java @@ -1,22 +1,9 @@ package com.mgm.mcrm.authorization.models; -import java.io.Serializable; -import java.util.Date; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.IdClass; -import jakarta.persistence.Table; -import jakarta.persistence.Transient; - +import jakarta.persistence.*; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Parameter; @Getter @Setter diff --git a/src/main/java/com/mgm/mcrm/authorization/models/SysUserView.java b/src/main/java/com/mgm/mcrm/authorization/models/SysUserView.java index 6f405bb..40ecee3 100644 --- a/src/main/java/com/mgm/mcrm/authorization/models/SysUserView.java +++ b/src/main/java/com/mgm/mcrm/authorization/models/SysUserView.java @@ -1,20 +1,13 @@ package com.mgm.mcrm.authorization.models; -import java.io.Serializable; -import java.util.Date; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import jakarta.persistence.Transient; - +import jakarta.persistence.*; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import java.io.Serializable; +import java.util.Date; + @Getter @Setter @NoArgsConstructor diff --git a/src/main/java/com/mgm/mcrm/authorization/repositories/SysGroupDao.java b/src/main/java/com/mgm/mcrm/authorization/repositories/SysGroupDao.java index 878fe74..c2559e6 100644 --- a/src/main/java/com/mgm/mcrm/authorization/repositories/SysGroupDao.java +++ b/src/main/java/com/mgm/mcrm/authorization/repositories/SysGroupDao.java @@ -1,16 +1,13 @@ package com.mgm.mcrm.authorization.repositories; -import java.util.List; - import com.mgm.mcrm.authorization.models.SysGroup; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.transaction.annotation.Transactional; + +import java.util.List; diff --git a/src/main/java/com/mgm/mcrm/authorization/repositories/SysGroupDataPermissionDao.java b/src/main/java/com/mgm/mcrm/authorization/repositories/SysGroupDataPermissionDao.java index 1051e3e..91372c8 100644 --- a/src/main/java/com/mgm/mcrm/authorization/repositories/SysGroupDataPermissionDao.java +++ b/src/main/java/com/mgm/mcrm/authorization/repositories/SysGroupDataPermissionDao.java @@ -1,16 +1,16 @@ package com.mgm.mcrm.authorization.repositories; -import java.util.List; - import com.mgm.mcrm.authorization.models.SysGroupDataPermission; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import java.util.List; -public interface SysGroupDataPermissionDao extends JpaRepository { + +public interface SysGroupDataPermissionDao extends JpaRepository { List findAll(Specification spec,Sort sort); List findAll(Specification spec); diff --git a/src/main/java/com/mgm/mcrm/authorization/repositories/SysGroupPermissionDao.java b/src/main/java/com/mgm/mcrm/authorization/repositories/SysGroupPermissionDao.java index d7c417a..4059809 100644 --- a/src/main/java/com/mgm/mcrm/authorization/repositories/SysGroupPermissionDao.java +++ b/src/main/java/com/mgm/mcrm/authorization/repositories/SysGroupPermissionDao.java @@ -1,16 +1,17 @@ package com.mgm.mcrm.authorization.repositories; -import java.util.List; - import com.mgm.mcrm.authorization.models.SysGroupPermission; +import com.mgm.mcrm.authorization.models.SysGroupPermissionKey; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import java.util.List; -public interface SysGroupPermissionDao extends JpaRepository { + +public interface SysGroupPermissionDao extends JpaRepository { List findAll(Specification spec,Sort sort); List findAll(Specification spec); diff --git a/src/main/java/com/mgm/mcrm/authorization/repositories/SysRouterDao.java b/src/main/java/com/mgm/mcrm/authorization/repositories/SysRouterDao.java index 0481e6b..d5d44d6 100644 --- a/src/main/java/com/mgm/mcrm/authorization/repositories/SysRouterDao.java +++ b/src/main/java/com/mgm/mcrm/authorization/repositories/SysRouterDao.java @@ -1,16 +1,13 @@ package com.mgm.mcrm.authorization.repositories; -import java.util.List; - import com.mgm.mcrm.authorization.models.SysRouter; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.transaction.annotation.Transactional; + +import java.util.List; diff --git a/src/main/java/com/mgm/mcrm/authorization/repositories/SysRouterPermissionDao.java b/src/main/java/com/mgm/mcrm/authorization/repositories/SysRouterPermissionDao.java index c9cf699..fe0b97e 100644 --- a/src/main/java/com/mgm/mcrm/authorization/repositories/SysRouterPermissionDao.java +++ b/src/main/java/com/mgm/mcrm/authorization/repositories/SysRouterPermissionDao.java @@ -1,7 +1,5 @@ package com.mgm.mcrm.authorization.repositories; -import java.util.List; - import com.mgm.mcrm.authorization.models.SysRouter; import com.mgm.mcrm.authorization.models.SysRouterPermission; import org.springframework.data.domain.Page; @@ -11,6 +9,8 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import java.util.List; + public interface SysRouterPermissionDao extends JpaRepository { List findAll(Specification spec, Sort sort); diff --git a/src/main/java/com/mgm/mcrm/authorization/repositories/SysUserDao.java b/src/main/java/com/mgm/mcrm/authorization/repositories/SysUserDao.java index 75e4087..e7ee32e 100644 --- a/src/main/java/com/mgm/mcrm/authorization/repositories/SysUserDao.java +++ b/src/main/java/com/mgm/mcrm/authorization/repositories/SysUserDao.java @@ -1,7 +1,5 @@ package com.mgm.mcrm.authorization.repositories; -import java.util.List; - import com.mgm.mcrm.authorization.models.SysUser; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -12,9 +10,11 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; +import java.util.List; -public interface SysUserDao extends JpaRepository { + +public interface SysUserDao extends JpaRepository { SysUser findById(long id); List findAll(Specification spec,Sort sort); List findAll(Specification spec); diff --git a/src/main/java/com/mgm/mcrm/authorization/repositories/SysUserSettingDao.java b/src/main/java/com/mgm/mcrm/authorization/repositories/SysUserSettingDao.java index c49b712..a13b4b1 100644 --- a/src/main/java/com/mgm/mcrm/authorization/repositories/SysUserSettingDao.java +++ b/src/main/java/com/mgm/mcrm/authorization/repositories/SysUserSettingDao.java @@ -1,13 +1,11 @@ package com.mgm.mcrm.authorization.repositories; -import java.util.List; - import com.mgm.mcrm.authorization.models.SysUserSetting; +import com.mgm.mcrm.authorization.models.SysUserSettingKey; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -public interface SysUserSettingDao extends JpaRepository { +public interface SysUserSettingDao extends JpaRepository { } diff --git a/src/main/java/com/mgm/mcrm/authorization/repositories/SysUserViewDao.java b/src/main/java/com/mgm/mcrm/authorization/repositories/SysUserViewDao.java index 4519af6..85c92da 100644 --- a/src/main/java/com/mgm/mcrm/authorization/repositories/SysUserViewDao.java +++ b/src/main/java/com/mgm/mcrm/authorization/repositories/SysUserViewDao.java @@ -1,7 +1,5 @@ package com.mgm.mcrm.authorization.repositories; -import java.util.List; - import com.mgm.mcrm.authorization.models.SysUserView; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -10,9 +8,11 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import java.util.List; -public interface SysUserViewDao extends JpaRepository { + +public interface SysUserViewDao extends JpaRepository { SysUserView findById(long id); List findAll(Specification spec,Sort sort); List findAll(Specification spec); diff --git a/src/main/java/com/mgm/mcrm/authorization/repositories/TokenDao.java b/src/main/java/com/mgm/mcrm/authorization/repositories/TokenDao.java index 076f8cf..e4c44d0 100644 --- a/src/main/java/com/mgm/mcrm/authorization/repositories/TokenDao.java +++ b/src/main/java/com/mgm/mcrm/authorization/repositories/TokenDao.java @@ -9,7 +9,7 @@ import org.springframework.transaction.annotation.Transactional; -public interface TokenDao extends JpaRepository { +public interface TokenDao extends JpaRepository { Token findById(long id); @Deprecated diff --git a/src/main/java/com/mgm/mcrm/authorization/services/AuthorizationService.java b/src/main/java/com/mgm/mcrm/authorization/services/AuthorizationService.java index d9b940e..ce96282 100644 --- a/src/main/java/com/mgm/mcrm/authorization/services/AuthorizationService.java +++ b/src/main/java/com/mgm/mcrm/authorization/services/AuthorizationService.java @@ -1,26 +1,20 @@ package com.mgm.mcrm.authorization.services; -import java.util.*; - -import com.google.gson.Gson; -import com.mgm.mcrm.authorization.models.SysRouterPermission; +import com.mgm.mcrm.appsetting.services.SettingService; import com.mgm.mcrm.authorization.models.SysUser; import com.mgm.mcrm.authorization.repositories.SysGroupDataPermissionDao; import com.mgm.mcrm.authorization.repositories.SysGroupPermissionDao; import com.mgm.mcrm.authorization.repositories.SysRouterPermissionDao; -import com.mgm.mcrm.booking.services.BookingService; +import com.mgm.mcrm.authorization.repositories.SysUserDao; +import com.mgm.mcrm.common.constants.SysCommon; +import com.mgm.mcrm.common.utils.LogUtil; +import com.mgm.mcrm.logging.models.SysLogLoginIp; import com.mgm.mcrm.logging.services.SysLogLoginIpService; import jakarta.annotation.Resource; - -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import com.mgm.mcrm.logging.models.SysLogLoginIp; -import com.mgm.mcrm.appsetting.models.CfgSettings; -import com.mgm.mcrm.appsetting.services.SettingService; -import com.mgm.mcrm.common.utils.LogUtil; -import com.mgm.mcrm.common.constants.SysCommon; -import com.mgm.mcrm.authorization.repositories.SysUserDao; +import java.util.Calendar; +import java.util.Date; @Service public class AuthorizationService { diff --git a/src/main/java/com/mgm/mcrm/authorization/services/MgmUserService.java b/src/main/java/com/mgm/mcrm/authorization/services/MgmUserService.java index a0d0693..48f6272 100644 --- a/src/main/java/com/mgm/mcrm/authorization/services/MgmUserService.java +++ b/src/main/java/com/mgm/mcrm/authorization/services/MgmUserService.java @@ -1,39 +1,36 @@ package com.mgm.mcrm.authorization.services; -import java.util.ArrayList; -import java.util.List; - +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.parser.Feature; import com.mgm.mcrm.authorization.models.SysGroupPermission; import com.mgm.mcrm.authorization.models.SysUserView; -import com.mgm.mcrm.common.constants.SysConstants; -import com.mgm.mcrm.common.dtos.BaseApiResponse; -import com.mgm.mcrm.common.services.MGMApiService; -import jakarta.annotation.Resource; - -import org.springframework.stereotype.Service; - -import com.alibaba.fastjson.parser.Feature; -import com.alibaba.fastjson.JSONObject; - -import com.mgm.mcrm.common.constants.SysCommon; -import com.mgm.mcrm.basesetting.property.repositories.BlockDao; -import com.mgm.mcrm.basesetting.team.repositories.DepartmentDao; -import com.mgm.mcrm.basesetting.team.repositories.DivisionDao; -import com.mgm.mcrm.basesetting.property.repositories.PropertyDao; -import com.mgm.mcrm.basesetting.team.repositories.SectionDao; -import com.mgm.mcrm.basesetting.team.repositories.TeamStructureDao; import com.mgm.mcrm.authorization.repositories.SysGroupPermissionDao; import com.mgm.mcrm.authorization.repositories.SysUserViewDao; import com.mgm.mcrm.basesetting.property.models.CfgBlocks; +import com.mgm.mcrm.basesetting.property.models.CfgProperties; +import com.mgm.mcrm.basesetting.property.repositories.BlockDao; +import com.mgm.mcrm.basesetting.property.repositories.PropertyDao; import com.mgm.mcrm.basesetting.team.models.CfgDepartments; import com.mgm.mcrm.basesetting.team.models.CfgDivisions; -import com.mgm.mcrm.basesetting.property.models.CfgProperties; import com.mgm.mcrm.basesetting.team.models.CfgSections; import com.mgm.mcrm.basesetting.team.models.CfgTeamStructure; +import com.mgm.mcrm.basesetting.team.repositories.DepartmentDao; +import com.mgm.mcrm.basesetting.team.repositories.DivisionDao; +import com.mgm.mcrm.basesetting.team.repositories.SectionDao; +import com.mgm.mcrm.basesetting.team.repositories.TeamStructureDao; +import com.mgm.mcrm.common.constants.SysCommon; +import com.mgm.mcrm.common.constants.SysConstants; +import com.mgm.mcrm.common.dtos.BaseApiResponse; +import com.mgm.mcrm.common.dtos.http_util.HttpResponseResult; import com.mgm.mcrm.common.dtos.mgm_api.CheckApproverResult; import com.mgm.mcrm.common.dtos.mgm_api.UserInfoApiRecord; import com.mgm.mcrm.common.dtos.mgm_api.UserInfoApiResult; -import com.mgm.mcrm.common.dtos.http_util.HttpResponseResult; +import com.mgm.mcrm.common.services.MGMApiService; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; @Service public class MgmUserService { diff --git a/src/main/java/com/mgm/mcrm/authorization/services/UserTokenService.java b/src/main/java/com/mgm/mcrm/authorization/services/UserTokenService.java index 482c0b7..83a2efa 100644 --- a/src/main/java/com/mgm/mcrm/authorization/services/UserTokenService.java +++ b/src/main/java/com/mgm/mcrm/authorization/services/UserTokenService.java @@ -1,12 +1,12 @@ package com.mgm.mcrm.authorization.services; import com.auth0.jwt.JWT; -import com.mgm.mcrm.authorization.utils.JwtTokenUtil; import com.mgm.mcrm.authorization.dtos.LoginUserInfo; import com.mgm.mcrm.authorization.dtos.RefreshTokenResponse; -import com.mgm.mcrm.common.constants.SysConstants; import com.mgm.mcrm.authorization.models.Token; import com.mgm.mcrm.authorization.repositories.TokenDao; +import com.mgm.mcrm.authorization.utils.JwtTokenUtil; +import com.mgm.mcrm.common.constants.SysConstants; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/mgm/mcrm/basesetting/agebucket/models/SysAgebucket.java b/src/main/java/com/mgm/mcrm/basesetting/agebucket/models/SysAgebucket.java index 5dbbab9..3c9e13e 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/agebucket/models/SysAgebucket.java +++ b/src/main/java/com/mgm/mcrm/basesetting/agebucket/models/SysAgebucket.java @@ -1,16 +1,10 @@ package com.mgm.mcrm.basesetting.agebucket.models; -import java.io.Serializable; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - +import jakarta.persistence.*; import lombok.Data; +import java.io.Serializable; + @Data @Entity @Table(name="sys_agebucket") diff --git a/src/main/java/com/mgm/mcrm/basesetting/agebucket/services/AgebucketService.java b/src/main/java/com/mgm/mcrm/basesetting/agebucket/services/AgebucketService.java index 94aab54..3d5bdfa 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/agebucket/services/AgebucketService.java +++ b/src/main/java/com/mgm/mcrm/basesetting/agebucket/services/AgebucketService.java @@ -14,7 +14,7 @@ import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; -import static org.apache.commons.collections4.CollectionUtils.*; +import static org.apache.commons.collections4.CollectionUtils.isEmpty; @Service public class AgebucketService { diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/dtos/response/ReservationDoorKeyResponse.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/dtos/response/ReservationDoorKeyResponse.java index c871e58..eaf71d7 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/dtos/response/ReservationDoorKeyResponse.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/dtos/response/ReservationDoorKeyResponse.java @@ -8,4 +8,8 @@ public class ReservationDoorKeyResponse { private String id; private boolean hasKey; + + private String roomId; + + private String roomNumber; } diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgBlockCodes.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgBlockCodes.java index f0e14eb..78a979f 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgBlockCodes.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgBlockCodes.java @@ -1,18 +1,12 @@ package com.mgm.mcrm.basesetting.daylight.models; +import com.fasterxml.jackson.annotation.JsonFormat; +import jakarta.persistence.*; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - @Data @Entity @Table(name = "cfg_block_codes") diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgDaylightMapping.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgDaylightMapping.java index af946d9..8a4d053 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgDaylightMapping.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgDaylightMapping.java @@ -1,12 +1,12 @@ package com.mgm.mcrm.basesetting.daylight.models; +import jakarta.persistence.*; +import lombok.Data; + import java.io.Serializable; import java.util.Date; import java.util.List; -import jakarta.persistence.*; -import lombok.Data; - @Data @Entity @Table(name = "cfg_daylight_mapping") diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgDaylightView.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgDaylightView.java index eae0643..410bc54 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgDaylightView.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgDaylightView.java @@ -1,22 +1,19 @@ package com.mgm.mcrm.basesetting.daylight.models; +import com.mgm.mcrm.basesetting.property.models.CfgProperties; +import com.mgm.mcrm.basesetting.room.models.CfgRoomTypes; +import com.mgm.mcrm.basesetting.team.models.CfgSections; +import com.mgm.mcrm.booking.models.CfgBookingTypes; +import jakarta.persistence.*; +import lombok.Data; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import java.io.Serializable; import java.util.Date; import java.util.List; import java.util.Set; -import com.mgm.mcrm.basesetting.property.models.CfgProperties; -import com.mgm.mcrm.basesetting.room.models.CfgRoomTypes; -import com.mgm.mcrm.basesetting.team.models.CfgDepartments; -import com.mgm.mcrm.basesetting.team.models.CfgDivisions; -import com.mgm.mcrm.basesetting.team.models.CfgSections; -import com.mgm.mcrm.booking.models.CfgBookingTypes; -import jakarta.persistence.*; - -import lombok.Data; -import org.hibernate.annotations.NotFound; -import org.hibernate.annotations.NotFoundAction; - @Data @Entity @Table(name="view_daylight") diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptDaylightRoomTypes.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptDaylightRoomTypes.java index 7a82371..5deb77e 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptDaylightRoomTypes.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptDaylightRoomTypes.java @@ -1,15 +1,11 @@ package com.mgm.mcrm.basesetting.daylight.models; +import jakarta.persistence.*; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.IdClass; -import jakarta.persistence.Table; -import lombok.Data; - @Data @Entity @Table(name="cfg_except_daylight_room_types") diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptionDaylight.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptionDaylight.java index b6b95a6..ccfd794 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptionDaylight.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptionDaylight.java @@ -1,18 +1,12 @@ package com.mgm.mcrm.basesetting.daylight.models; +import jakarta.persistence.*; +import lombok.Data; + import java.io.Serializable; import java.util.Date; import java.util.List; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import jakarta.persistence.Transient; -import lombok.Data; - @Data @Entity @Table(name="cfg_exception_daylight") diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptionDaylightView.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptionDaylightView.java index a2e6fd2..061a508 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptionDaylightView.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptionDaylightView.java @@ -1,18 +1,17 @@ package com.mgm.mcrm.basesetting.daylight.models; +import com.mgm.mcrm.basesetting.property.models.CfgProperties; +import com.mgm.mcrm.basesetting.room.models.CfgRoomTypes; +import com.mgm.mcrm.booking.models.CfgBookingTypes; +import jakarta.persistence.*; +import lombok.Data; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import java.io.Serializable; import java.util.Date; import java.util.Set; -import com.mgm.mcrm.basesetting.property.models.CfgProperties; -import com.mgm.mcrm.basesetting.room.models.CfgRoomTypes; -import jakarta.persistence.*; - -import lombok.Data; -import org.hibernate.annotations.NotFound; -import org.hibernate.annotations.NotFoundAction; -import com.mgm.mcrm.booking.models.CfgBookingTypes; - @Data @Entity @Table(name="view_exception_daylight") diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptionOperaView.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptionOperaView.java index 4307d87..f9aa59c 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptionOperaView.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptionOperaView.java @@ -1,18 +1,17 @@ package com.mgm.mcrm.basesetting.daylight.models; +import com.mgm.mcrm.basesetting.property.models.CfgProperties; +import com.mgm.mcrm.basesetting.room.models.CfgRoomTypes; +import com.mgm.mcrm.booking.models.CfgBookingTypes; +import jakarta.persistence.*; +import lombok.Data; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import java.io.Serializable; import java.util.Date; import java.util.Set; -import com.mgm.mcrm.basesetting.property.models.CfgProperties; -import com.mgm.mcrm.basesetting.room.models.CfgRoomTypes; -import jakarta.persistence.*; - -import lombok.Data; -import org.hibernate.annotations.NotFound; -import org.hibernate.annotations.NotFoundAction; -import com.mgm.mcrm.booking.models.CfgBookingTypes; - @Data @Entity @Table(name="view_exception_opera") diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgItemInventory.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgItemInventory.java index 5651cfc..95d1d6d 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgItemInventory.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgItemInventory.java @@ -1,16 +1,11 @@ package com.mgm.mcrm.basesetting.daylight.models; +import jakarta.persistence.*; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import lombok.Data; - @Data @Entity @Table(name="cfg_item_inventory") diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgMarketCodes.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgMarketCodes.java index 59aaf2f..552063e 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgMarketCodes.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgMarketCodes.java @@ -1,16 +1,11 @@ package com.mgm.mcrm.basesetting.daylight.models; +import jakarta.persistence.*; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import lombok.Data; - @Data @Entity @Table(name = "cfg_market_codes") diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgNonMGMStatusMapping.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgNonMGMStatusMapping.java index 63ab526..4080686 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgNonMGMStatusMapping.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgNonMGMStatusMapping.java @@ -1,21 +1,12 @@ package com.mgm.mcrm.basesetting.daylight.models; -import java.util.Date; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; - -import org.hibernate.annotations.NotFound; -import org.hibernate.annotations.NotFoundAction; import com.mgm.mcrm.basesetting.property.models.CfgProperties; import com.mgm.mcrm.basesetting.room.models.CfgRooms; +import jakarta.persistence.*; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import java.util.Date; @Entity @Table(name="cfg_nonmgm_status_mapping") diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgOperaView.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgOperaView.java index 9b34b3f..eb2e2dd 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgOperaView.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgOperaView.java @@ -1,18 +1,17 @@ package com.mgm.mcrm.basesetting.daylight.models; +import com.mgm.mcrm.basesetting.property.models.CfgProperties; +import com.mgm.mcrm.basesetting.room.models.CfgRoomTypes; +import com.mgm.mcrm.booking.models.CfgBookingTypes; +import jakarta.persistence.*; +import lombok.Data; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import java.io.Serializable; import java.util.Date; import java.util.Set; -import com.mgm.mcrm.basesetting.property.models.CfgProperties; -import com.mgm.mcrm.basesetting.room.models.CfgRoomTypes; -import jakarta.persistence.*; - -import lombok.Data; -import org.hibernate.annotations.NotFound; -import org.hibernate.annotations.NotFoundAction; -import com.mgm.mcrm.booking.models.CfgBookingTypes; - @Data @Entity @Table(name="view_opera") diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgOtherFollowUpStatus.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgOtherFollowUpStatus.java index 2379abb..7c8c467 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgOtherFollowUpStatus.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgOtherFollowUpStatus.java @@ -1,13 +1,8 @@ package com.mgm.mcrm.basesetting.daylight.models; -import java.io.Serializable; +import jakarta.persistence.*; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; +import java.io.Serializable; @Entity @Table(name="cfg_other_follow_up_status") diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgOtherSegment.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgOtherSegment.java index 2a802d8..c7f6ab0 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgOtherSegment.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgOtherSegment.java @@ -1,16 +1,10 @@ package com.mgm.mcrm.basesetting.daylight.models; +import jakarta.persistence.*; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import jakarta.persistence.Transient; - @Entity @Table(name="cfg_other_segment") public class CfgOtherSegment implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgRateCodes.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgRateCodes.java index b489fb1..624efb2 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgRateCodes.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgRateCodes.java @@ -1,16 +1,11 @@ package com.mgm.mcrm.basesetting.daylight.models; +import jakarta.persistence.*; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import lombok.Data; - @Data @Entity @Table(name="cfg_rate_codes") diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgSourceCodes.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgSourceCodes.java index 5a9cab0..9d782e7 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgSourceCodes.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgSourceCodes.java @@ -1,16 +1,11 @@ package com.mgm.mcrm.basesetting.daylight.models; +import jakarta.persistence.*; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import lombok.Data; - @Entity @Data @Table(name="cfg_source_codes") diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgTiers.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgTiers.java index cdfd89a..79bfdb8 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgTiers.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgTiers.java @@ -1,17 +1,11 @@ package com.mgm.mcrm.basesetting.daylight.models; +import jakarta.persistence.*; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import com.mgm.mcrm.logging.models.SysLogBooking; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import lombok.Data; - @Data @Entity @Table(name="cfg_tiers") diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/BlockCodeDao.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/BlockCodeDao.java index ac4db12..3735f73 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/BlockCodeDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/BlockCodeDao.java @@ -1,7 +1,6 @@ package com.mgm.mcrm.basesetting.daylight.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.daylight.models.CfgBlockCodes; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -11,7 +10,7 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; -import com.mgm.mcrm.basesetting.daylight.models.CfgBlockCodes; +import java.util.List; public interface BlockCodeDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/DaylightDao.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/DaylightDao.java index c1c2322..6221194 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/DaylightDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/DaylightDao.java @@ -1,7 +1,6 @@ package com.mgm.mcrm.basesetting.daylight.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.daylight.models.CfgDaylightMapping; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -11,7 +10,7 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; -import com.mgm.mcrm.basesetting.daylight.models.CfgDaylightMapping; +import java.util.List; public interface DaylightDao extends JpaRepository { CfgDaylightMapping findById(long id); diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/DaylightViewDao.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/DaylightViewDao.java index 2eb1b3c..e5e0ff1 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/DaylightViewDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/DaylightViewDao.java @@ -1,19 +1,17 @@ package com.mgm.mcrm.basesetting.daylight.repositories; -import java.util.List; -import java.util.Optional; - -import com.mgm.mcrm.basesetting.team.models.CfgSections; +import com.mgm.mcrm.basesetting.daylight.models.CfgDaylightView; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; -import com.mgm.mcrm.basesetting.daylight.models.CfgDaylightView; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import java.util.List; + public interface DaylightViewDao extends JpaRepository { @EntityGraph(value = "graph.DaylightMapping.fulldetails",type = EntityGraph.EntityGraphType.LOAD) diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/ExceptionDaylightDao.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/ExceptionDaylightDao.java index bea0ae6..b64383d 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/ExceptionDaylightDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/ExceptionDaylightDao.java @@ -1,7 +1,6 @@ package com.mgm.mcrm.basesetting.daylight.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.daylight.models.CfgExceptionDaylight; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -11,7 +10,7 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; -import com.mgm.mcrm.basesetting.daylight.models.CfgExceptionDaylight; +import java.util.List; public interface ExceptionDaylightDao extends JpaRepository { CfgExceptionDaylight findById(long id); diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/ExceptionDaylightViewDao.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/ExceptionDaylightViewDao.java index 6e08d16..e445f65 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/ExceptionDaylightViewDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/ExceptionDaylightViewDao.java @@ -1,14 +1,14 @@ package com.mgm.mcrm.basesetting.daylight.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.daylight.models.CfgExceptionDaylightView; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; -import com.mgm.mcrm.basesetting.daylight.models.CfgExceptionDaylightView; + +import java.util.List; public interface ExceptionDaylightViewDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/ItemInventoryDao.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/ItemInventoryDao.java index 5d00fb9..67d55ac 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/ItemInventoryDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/ItemInventoryDao.java @@ -1,13 +1,13 @@ package com.mgm.mcrm.basesetting.daylight.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.daylight.models.CfgItemInventory; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; -import com.mgm.mcrm.basesetting.daylight.models.CfgItemInventory; + +import java.util.List; public interface ItemInventoryDao extends JpaRepository { CfgItemInventory findByTierIdAndRoomId(Long tierId,Long roomId); diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/MarketCodeDao.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/MarketCodeDao.java index 2443fce..627ade3 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/MarketCodeDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/MarketCodeDao.java @@ -1,7 +1,6 @@ package com.mgm.mcrm.basesetting.daylight.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.daylight.models.CfgMarketCodes; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -11,7 +10,7 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; -import com.mgm.mcrm.basesetting.daylight.models.CfgMarketCodes; +import java.util.List; public interface MarketCodeDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/OperaViewDao.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/OperaViewDao.java index f038720..d53296c 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/OperaViewDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/OperaViewDao.java @@ -8,11 +8,8 @@ import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; import java.util.List; -import java.util.Optional; public interface OperaViewDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/OtherSegmentDao.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/OtherSegmentDao.java index 6cf09e6..2ea75f9 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/OtherSegmentDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/OtherSegmentDao.java @@ -1,14 +1,13 @@ package com.mgm.mcrm.basesetting.daylight.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.daylight.models.CfgOtherSegment; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; -import com.mgm.mcrm.basesetting.daylight.models.CfgOtherSegment; +import java.util.List; public interface OtherSegmentDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/RateCodeDao.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/RateCodeDao.java index 3f0e3f3..1b276ea 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/RateCodeDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/RateCodeDao.java @@ -1,7 +1,6 @@ package com.mgm.mcrm.basesetting.daylight.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.daylight.models.CfgRateCodes; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -11,7 +10,7 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; -import com.mgm.mcrm.basesetting.daylight.models.CfgRateCodes; +import java.util.List; public interface RateCodeDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/SourceCodeDao.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/SourceCodeDao.java index e361d8d..3801f98 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/SourceCodeDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/SourceCodeDao.java @@ -1,7 +1,7 @@ package com.mgm.mcrm.basesetting.daylight.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.daylight.models.CfgRateCodes; +import com.mgm.mcrm.basesetting.daylight.models.CfgSourceCodes; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -11,8 +11,7 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; -import com.mgm.mcrm.basesetting.daylight.models.CfgRateCodes; -import com.mgm.mcrm.basesetting.daylight.models.CfgSourceCodes; +import java.util.List; public interface SourceCodeDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/TierDao.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/TierDao.java index 1be8950..1b61b0c 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/TierDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/TierDao.java @@ -1,13 +1,13 @@ package com.mgm.mcrm.basesetting.daylight.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.daylight.models.CfgTiers; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; -import com.mgm.mcrm.basesetting.daylight.models.CfgTiers; + +import java.util.List; public interface TierDao extends JpaRepository { CfgTiers findByTierNameAndCategory(String string, String category); diff --git a/src/main/java/com/mgm/mcrm/basesetting/daylight/services/DaylightService.java b/src/main/java/com/mgm/mcrm/basesetting/daylight/services/DaylightService.java index 1fad7a5..8cb0cf2 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/daylight/services/DaylightService.java +++ b/src/main/java/com/mgm/mcrm/basesetting/daylight/services/DaylightService.java @@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.mgm.mcrm.basesetting.agebucket.models.SysAgebucket; import com.mgm.mcrm.basesetting.agebucket.services.AgebucketService; -import com.mgm.mcrm.basesetting.daylight.dtos.response.*; import com.mgm.mcrm.basesetting.daylight.dtos.request.*; +import com.mgm.mcrm.basesetting.daylight.dtos.response.*; import com.mgm.mcrm.basesetting.daylight.models.*; import com.mgm.mcrm.basesetting.daylight.repositories.CompPresetDao; import com.mgm.mcrm.basesetting.daylight.repositories.DaylightConfigurationDao; @@ -27,12 +27,13 @@ import com.mgm.mcrm.booking.models.Bookings; import com.mgm.mcrm.booking.repositories.BookingDao; import com.mgm.mcrm.booking.services.BookingService; import com.mgm.mcrm.common.dtos.BaseApiResponse; -import com.mgm.mcrm.common.enums.EnumBookingStatus; import com.mgm.mcrm.common.dtos.HttpResult; import com.mgm.mcrm.common.dtos.mgm_api.PlayerProfileEntry; +import com.mgm.mcrm.common.enums.EnumBookingStatus; import com.mgm.mcrm.common.httpclient.HttpHeaderBuilder; import com.mgm.mcrm.common.services.HttpService; -import com.mgm.mcrm.common.utils.*; +import com.mgm.mcrm.common.utils.DateTimeUtil; +import com.mgm.mcrm.common.utils.LogUtil; import com.mgm.mcrm.player.dtos.RatePricingDetail; import com.mgm.mcrm.player.dtos.response.DaylightReservationResponse; import com.mgm.mcrm.player.services.PlayerService; @@ -698,6 +699,25 @@ public class DaylightService { if (CollectionUtils.isNotEmpty(reservations)) { JSONObject reservation = reservations.getJSONObject(0); doorKeyResponse.setId(reservation.getString("id")); + + String roomId = reservation.getString("roomId"); + doorKeyResponse.setRoomId(roomId); + if (StringUtils.isNotBlank(roomId)) { + CfgDaylightConfiguration roomConfig = dlConfigurationDao.findByDlPropertyIdAndConfigName(dlPropertyId, "Room"); + if (roomConfig != null && StringUtils.isNotBlank(roomConfig.getConfigValue())) { + JSONArray roomArray = JSON.parseArray(roomConfig.getConfigValue()); + if (roomArray != null) { + for (int i = 0; i < roomArray.size(); i++) { + JSONObject roomObj = roomArray.getJSONObject(i); + if (roomId.equals(roomObj.getString("id"))) { + doorKeyResponse.setRoomNumber(roomObj.getString("code")); + break; + } + } + } + } + } + JSONObject embedded = reservation.getJSONObject("_embedded"); JSONObject doorKeys = embedded == null ? null : embedded.getJSONObject("doorKeys"); Integer amount = doorKeys == null ? null : doorKeys.getInteger("doorKeyAmount"); @@ -2068,7 +2088,7 @@ public class DaylightService { String ratePlanId = rateCodes.getFirst().getDlRatePlanId(); String dlRoomTypeId = null; - CfgRooms room = roomDao.findById(bookings.getRoomId()); + CfgRooms room = roomDao.findById(bookings.getRoomId()).orElse(null); List roomRoomType = room.getRoomRoomType(); for(CfgRoomTypes type:roomRoomType) { dlRoomTypeId = type.getDlRoomTypeId(); diff --git a/src/main/java/com/mgm/mcrm/basesetting/property/dtos/response/DayLightProfileResponse.java b/src/main/java/com/mgm/mcrm/basesetting/property/dtos/response/DayLightProfileResponse.java index 5a0cd81..1bd6b5b 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/property/dtos/response/DayLightProfileResponse.java +++ b/src/main/java/com/mgm/mcrm/basesetting/property/dtos/response/DayLightProfileResponse.java @@ -1,10 +1,7 @@ package com.mgm.mcrm.basesetting.property.dtos.response; -import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; -import java.util.List; - @Data public class DayLightProfileResponse { private String id; diff --git a/src/main/java/com/mgm/mcrm/basesetting/property/dtos/response/ResultResponse.java b/src/main/java/com/mgm/mcrm/basesetting/property/dtos/response/ResultResponse.java index eb2cb59..1b647ed 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/property/dtos/response/ResultResponse.java +++ b/src/main/java/com/mgm/mcrm/basesetting/property/dtos/response/ResultResponse.java @@ -1,11 +1,7 @@ package com.mgm.mcrm.basesetting.property.dtos.response; -import com.mgm.mcrm.basesetting.daylight.dtos.response.ProfileDetailResponse; -import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; -import java.util.List; - /** * 对应外层返回的 JSON： * { diff --git a/src/main/java/com/mgm/mcrm/basesetting/property/models/CfgBlocks.java b/src/main/java/com/mgm/mcrm/basesetting/property/models/CfgBlocks.java index 0f3c475..d3a31ee 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/property/models/CfgBlocks.java +++ b/src/main/java/com/mgm/mcrm/basesetting/property/models/CfgBlocks.java @@ -1,16 +1,10 @@ package com.mgm.mcrm.basesetting.property.models; +import jakarta.persistence.*; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import jakarta.persistence.Transient; - @Entity @Table(name="cfg_blocks") public class CfgBlocks implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/basesetting/property/models/CfgProperties.java b/src/main/java/com/mgm/mcrm/basesetting/property/models/CfgProperties.java index ab46dd7..c835857 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/property/models/CfgProperties.java +++ b/src/main/java/com/mgm/mcrm/basesetting/property/models/CfgProperties.java @@ -1,16 +1,11 @@ package com.mgm.mcrm.basesetting.property.models; +import jakarta.persistence.*; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import lombok.Data; - @Data @Entity @Table(name="cfg_properties") diff --git a/src/main/java/com/mgm/mcrm/basesetting/property/repositories/BlockDao.java b/src/main/java/com/mgm/mcrm/basesetting/property/repositories/BlockDao.java index da686b8..8872786 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/property/repositories/BlockDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/property/repositories/BlockDao.java @@ -1,7 +1,6 @@ package com.mgm.mcrm.basesetting.property.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.property.models.CfgBlocks; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -11,7 +10,7 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; -import com.mgm.mcrm.basesetting.property.models.CfgBlocks; +import java.util.List; diff --git a/src/main/java/com/mgm/mcrm/basesetting/property/repositories/PropertyDao.java b/src/main/java/com/mgm/mcrm/basesetting/property/repositories/PropertyDao.java index e36c7bd..2b8e6be 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/property/repositories/PropertyDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/property/repositories/PropertyDao.java @@ -1,8 +1,6 @@ package com.mgm.mcrm.basesetting.property.repositories; -import java.util.Collection; -import java.util.List; - +import com.mgm.mcrm.basesetting.property.models.CfgProperties; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -12,9 +10,10 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; -import com.mgm.mcrm.basesetting.property.models.CfgProperties; +import java.util.Collection; +import java.util.List; -public interface PropertyDao extends JpaRepository { +public interface PropertyDao extends JpaRepository { @Query(value="select * from cfg_properties with (nolock) where id=?1",nativeQuery=true) CfgProperties getById(long id); diff --git a/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgBedTypeMapping.java b/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgBedTypeMapping.java index 9061760..a21d3f0 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgBedTypeMapping.java +++ b/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgBedTypeMapping.java @@ -1,17 +1,11 @@ package com.mgm.mcrm.basesetting.room.models; +import jakarta.persistence.*; +import lombok.Data; + import java.util.Date; import java.util.List; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import jakarta.persistence.Transient; -import lombok.Data; - @Data @Entity @Table(name="cfg_bed_type_mapping") diff --git a/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgBedTypeMappingView.java b/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgBedTypeMappingView.java index b90b2d1..d35ccaa 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgBedTypeMappingView.java +++ b/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgBedTypeMappingView.java @@ -1,13 +1,8 @@ package com.mgm.mcrm.basesetting.room.models; -import java.util.Date; +import jakarta.persistence.*; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; +import java.util.Date; @Entity @Table(name="cfg_bed_type_mapping") diff --git a/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgOtherRoomStatus.java b/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgOtherRoomStatus.java index 1ebee80..43406b1 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgOtherRoomStatus.java +++ b/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgOtherRoomStatus.java @@ -1,15 +1,10 @@ package com.mgm.mcrm.basesetting.room.models; +import jakarta.persistence.*; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - @Entity @Table(name="cfg_other_room_status") public class CfgOtherRoomStatus implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRoomFeatures.java b/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRoomFeatures.java index 5a33bab..d14856f 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRoomFeatures.java +++ b/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRoomFeatures.java @@ -1,16 +1,11 @@ package com.mgm.mcrm.basesetting.room.models; +import jakarta.persistence.*; +import lombok.Data; + import java.io.Serializable; import java.time.LocalDateTime; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import lombok.Data; - @Entity @Table(name = "cfg_room_features") @Data diff --git a/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRoomTypes.java b/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRoomTypes.java index 63ce3bd..8fa6bed 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRoomTypes.java +++ b/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRoomTypes.java @@ -1,16 +1,11 @@ package com.mgm.mcrm.basesetting.room.models; +import jakarta.persistence.*; +import lombok.Data; + import java.io.Serializable; import java.time.LocalDateTime; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import lombok.Data; - @Entity @Table(name="cfg_room_types") @Data diff --git a/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRooms.java b/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRooms.java index cb5f9f1..6b62642 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRooms.java +++ b/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRooms.java @@ -1,16 +1,15 @@ package com.mgm.mcrm.basesetting.room.models; +import com.mgm.mcrm.basesetting.property.models.CfgProperties; +import jakarta.persistence.*; +import lombok.Data; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import java.io.Serializable; import java.util.Date; import java.util.List; -import jakarta.persistence.*; - -import lombok.Data; -import org.hibernate.annotations.NotFound; -import org.hibernate.annotations.NotFoundAction; -import com.mgm.mcrm.basesetting.property.models.CfgProperties; - @Data @Entity @Table(name="cfg_rooms") diff --git a/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRoomsRoomTypes.java b/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRoomsRoomTypes.java index c624a55..8bb92bf 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRoomsRoomTypes.java +++ b/src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRoomsRoomTypes.java @@ -1,14 +1,10 @@ package com.mgm.mcrm.basesetting.room.models; +import jakarta.persistence.*; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.IdClass; -import jakarta.persistence.Table; - @Entity @Table(name="cfg_rooms_room_types") @IdClass(CfgRoomsRoomTypesKey.class) diff --git a/src/main/java/com/mgm/mcrm/basesetting/room/repositories/BedTypeMappingDao.java b/src/main/java/com/mgm/mcrm/basesetting/room/repositories/BedTypeMappingDao.java index eaad6ac..4d2b6d1 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/room/repositories/BedTypeMappingDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/room/repositories/BedTypeMappingDao.java @@ -1,7 +1,6 @@ package com.mgm.mcrm.basesetting.room.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.room.models.CfgBedTypeMapping; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -9,7 +8,7 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; -import com.mgm.mcrm.basesetting.room.models.CfgBedTypeMapping; +import java.util.List; public interface BedTypeMappingDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/basesetting/room/repositories/OtherRoomStatusDao.java b/src/main/java/com/mgm/mcrm/basesetting/room/repositories/OtherRoomStatusDao.java index d0a327c..b375d00 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/room/repositories/OtherRoomStatusDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/room/repositories/OtherRoomStatusDao.java @@ -1,7 +1,6 @@ package com.mgm.mcrm.basesetting.room.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.room.models.CfgOtherRoomStatus; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -9,7 +8,7 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; -import com.mgm.mcrm.basesetting.room.models.CfgOtherRoomStatus; +import java.util.List; public interface OtherRoomStatusDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomDao.java b/src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomDao.java index e3fa447..06adc01 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomDao.java @@ -1,22 +1,19 @@ package com.mgm.mcrm.basesetting.room.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.room.models.CfgRooms; +import com.mgm.mcrm.roomcalendar.repositories.RoomCalendarRoomProjection; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.transaction.annotation.Transactional; -import com.mgm.mcrm.basesetting.room.models.CfgRooms; -import com.mgm.mcrm.roomcalendar.repositories.RoomCalendarRoomProjection; +import java.util.List; -public interface RoomDao extends JpaRepository { +public interface RoomDao extends JpaRepository { @EntityGraph(value = "graph.RoomSetting.fulldetails",type = EntityGraph.EntityGraphType.LOAD) CfgRooms findById(long id); @@ -29,13 +26,6 @@ public interface RoomDao extends JpaRepository { Page findAll(Specification spec, Pageable pageable); - @Transactional - @Modifying - @Query(value = " delete from cfg_rooms where id=?1 ",nativeQuery=true) - int deleteById(long id); - - @Query(value="select * from cfg_rooms where id =?1",nativeQuery=true) - CfgRooms getById(Long id); @Query("select r.propertyId as propertyId, r.name as name, r.calendarName as calendarName, " + "r.calendarOrder as calendarOrder, r.defaultShowCalendar as defaultShowCalendar " diff --git a/src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomFeatureDao.java b/src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomFeatureDao.java index d4db43d..b0682ab 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomFeatureDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomFeatureDao.java @@ -1,7 +1,6 @@ package com.mgm.mcrm.basesetting.room.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.room.models.CfgRoomFeatures; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -9,7 +8,7 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; -import com.mgm.mcrm.basesetting.room.models.CfgRoomFeatures; +import java.util.List; public interface RoomFeatureDao extends JpaRepository { List findAll(Specification spec); diff --git a/src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomRoomTypeDao.java b/src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomRoomTypeDao.java index 6d8b690..3beb297 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomRoomTypeDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomRoomTypeDao.java @@ -1,14 +1,14 @@ package com.mgm.mcrm.basesetting.room.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.room.models.CfgRoomsRoomTypes; +import com.mgm.mcrm.basesetting.room.models.CfgRoomsRoomTypesKey; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; -import com.mgm.mcrm.basesetting.room.models.CfgRoomsRoomTypes; +import java.util.List; -public interface RoomRoomTypeDao extends JpaRepository { +public interface RoomRoomTypeDao extends JpaRepository { List findByRoomTypeId(Long roomTypeId); @Query(value="select * from cfg_rooms_room_types where room_id =?1",nativeQuery=true) diff --git a/src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomTypeDao.java b/src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomTypeDao.java index d96069c..291439f 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomTypeDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomTypeDao.java @@ -1,7 +1,6 @@ package com.mgm.mcrm.basesetting.room.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.room.models.CfgRoomTypes; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -11,10 +10,10 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; -import com.mgm.mcrm.basesetting.room.models.CfgRoomTypes; +import java.util.List; -public interface RoomTypeDao extends JpaRepository { +public interface RoomTypeDao extends JpaRepository { CfgRoomTypes findById(long id); CfgRoomTypes findByCodeAndCategory(String code,String category); List findAll(Specification spec,Sort sort); diff --git a/src/main/java/com/mgm/mcrm/basesetting/room/services/OtherRoomStatusService.java b/src/main/java/com/mgm/mcrm/basesetting/room/services/OtherRoomStatusService.java index 0fb75f0..d092537 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/room/services/OtherRoomStatusService.java +++ b/src/main/java/com/mgm/mcrm/basesetting/room/services/OtherRoomStatusService.java @@ -1,10 +1,9 @@ package com.mgm.mcrm.basesetting.room.services; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - import com.mgm.mcrm.basesetting.room.models.CfgOtherRoomStatus; import com.mgm.mcrm.basesetting.room.repositories.OtherRoomStatusDao; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; @Service public class OtherRoomStatusService { diff --git a/src/main/java/com/mgm/mcrm/basesetting/team/models/AppUsers.java b/src/main/java/com/mgm/mcrm/basesetting/team/models/AppUsers.java index 69e43b2..572a870 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/team/models/AppUsers.java +++ b/src/main/java/com/mgm/mcrm/basesetting/team/models/AppUsers.java @@ -1,22 +1,13 @@ package com.mgm.mcrm.basesetting.team.models; +import com.mgm.mcrm.basesetting.property.models.CfgProperties; +import jakarta.persistence.*; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; - -import org.hibernate.annotations.NotFound; -import org.hibernate.annotations.NotFoundAction; -import com.mgm.mcrm.basesetting.property.models.CfgProperties; - @Entity @Table(name="app_users") public class AppUsers implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgDepartments.java b/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgDepartments.java index f6e4c35..211b1bd 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgDepartments.java +++ b/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgDepartments.java @@ -1,15 +1,10 @@ package com.mgm.mcrm.basesetting.team.models; +import jakarta.persistence.*; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - @Entity @Table(name="cfg_departments") public class CfgDepartments implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgDivisions.java b/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgDivisions.java index 5484957..03ae9e5 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgDivisions.java +++ b/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgDivisions.java @@ -1,15 +1,10 @@ package com.mgm.mcrm.basesetting.team.models; +import jakarta.persistence.*; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - @Entity @Table(name="cfg_divisions") public class CfgDivisions implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgOtherUserMapping.java b/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgOtherUserMapping.java index f6434d9..a03a7b1 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgOtherUserMapping.java +++ b/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgOtherUserMapping.java @@ -1,15 +1,10 @@ package com.mgm.mcrm.basesetting.team.models; +import jakarta.persistence.*; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - @Entity @Table(name="cfg_other_user_mapping") public class CfgOtherUserMapping implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgSections.java b/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgSections.java index 2bbaa4b..0fe2071 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgSections.java +++ b/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgSections.java @@ -1,15 +1,10 @@ package com.mgm.mcrm.basesetting.team.models; +import jakarta.persistence.*; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - @Entity @Table(name="cfg_sections") public class CfgSections implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgTeamStructure.java b/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgTeamStructure.java index 810beb7..d650d00 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgTeamStructure.java +++ b/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgTeamStructure.java @@ -1,15 +1,10 @@ package com.mgm.mcrm.basesetting.team.models; +import jakarta.persistence.*; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - @Entity @Table(name="cfg_team_structure") public class CfgTeamStructure implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgTeamStructureView.java b/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgTeamStructureView.java index f5f0461..ed51dcb 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgTeamStructureView.java +++ b/src/main/java/com/mgm/mcrm/basesetting/team/models/CfgTeamStructureView.java @@ -1,24 +1,12 @@ package com.mgm.mcrm.basesetting.team.models; +import jakarta.persistence.*; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.NamedAttributeNode; -import jakarta.persistence.NamedEntityGraph; -import jakarta.persistence.NamedEntityGraphs; -import jakarta.persistence.Table; - -import org.hibernate.annotations.NotFound; -import org.hibernate.annotations.NotFoundAction; - @Entity @Table(name="cfg_team_structure") @NamedEntityGraphs({ diff --git a/src/main/java/com/mgm/mcrm/basesetting/team/repositories/AppUserDao.java b/src/main/java/com/mgm/mcrm/basesetting/team/repositories/AppUserDao.java index 2b30101..ecd6be9 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/team/repositories/AppUserDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/team/repositories/AppUserDao.java @@ -1,7 +1,6 @@ package com.mgm.mcrm.basesetting.team.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.team.models.AppUsers; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -11,7 +10,7 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; -import com.mgm.mcrm.basesetting.team.models.AppUsers; +import java.util.List; public interface AppUserDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/basesetting/team/repositories/DepartmentDao.java b/src/main/java/com/mgm/mcrm/basesetting/team/repositories/DepartmentDao.java index e3b94d8..b05dcbc 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/team/repositories/DepartmentDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/team/repositories/DepartmentDao.java @@ -1,7 +1,6 @@ package com.mgm.mcrm.basesetting.team.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.team.models.CfgDepartments; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -11,7 +10,7 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; -import com.mgm.mcrm.basesetting.team.models.CfgDepartments; +import java.util.List; public interface DepartmentDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/basesetting/team/repositories/DivisionDao.java b/src/main/java/com/mgm/mcrm/basesetting/team/repositories/DivisionDao.java index 22b7040..1ad6c7c 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/team/repositories/DivisionDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/team/repositories/DivisionDao.java @@ -1,7 +1,6 @@ package com.mgm.mcrm.basesetting.team.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.team.models.CfgDivisions; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -11,7 +10,7 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; -import com.mgm.mcrm.basesetting.team.models.CfgDivisions; +import java.util.List; public interface DivisionDao extends JpaRepository { CfgDivisions findById(long id); diff --git a/src/main/java/com/mgm/mcrm/basesetting/team/repositories/OtherUserMappingDao.java b/src/main/java/com/mgm/mcrm/basesetting/team/repositories/OtherUserMappingDao.java index 046ebea..7f9fc5b 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/team/repositories/OtherUserMappingDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/team/repositories/OtherUserMappingDao.java @@ -1,14 +1,13 @@ package com.mgm.mcrm.basesetting.team.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.team.models.CfgOtherUserMapping; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; -import com.mgm.mcrm.basesetting.team.models.CfgOtherUserMapping; +import java.util.List; public interface OtherUserMappingDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/basesetting/team/repositories/SectionDao.java b/src/main/java/com/mgm/mcrm/basesetting/team/repositories/SectionDao.java index b14aeb9..4699c5d 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/team/repositories/SectionDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/team/repositories/SectionDao.java @@ -1,7 +1,6 @@ package com.mgm.mcrm.basesetting.team.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.team.models.CfgSections; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -11,7 +10,7 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; -import com.mgm.mcrm.basesetting.team.models.CfgSections; +import java.util.List; public interface SectionDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/basesetting/team/repositories/TeamStructureDao.java b/src/main/java/com/mgm/mcrm/basesetting/team/repositories/TeamStructureDao.java index 94b3d90..b415262 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/team/repositories/TeamStructureDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/team/repositories/TeamStructureDao.java @@ -1,7 +1,6 @@ package com.mgm.mcrm.basesetting.team.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.team.models.CfgTeamStructure; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -11,7 +10,7 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; -import com.mgm.mcrm.basesetting.team.models.CfgTeamStructure; +import java.util.List; public interface TeamStructureDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/basesetting/team/repositories/TeamStructureViewDao.java b/src/main/java/com/mgm/mcrm/basesetting/team/repositories/TeamStructureViewDao.java index 9ef626c..408ffbe 100644 --- a/src/main/java/com/mgm/mcrm/basesetting/team/repositories/TeamStructureViewDao.java +++ b/src/main/java/com/mgm/mcrm/basesetting/team/repositories/TeamStructureViewDao.java @@ -1,7 +1,6 @@ package com.mgm.mcrm.basesetting.team.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.team.models.CfgTeamStructureView; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -9,10 +8,9 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; -import com.mgm.mcrm.basesetting.team.models.CfgTeamStructureView; +import java.util.List; public interface TeamStructureViewDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/booking/controllers/BookingController.java b/src/main/java/com/mgm/mcrm/booking/controllers/BookingController.java index 83cc655..6e0d110 100644 --- a/src/main/java/com/mgm/mcrm/booking/controllers/BookingController.java +++ b/src/main/java/com/mgm/mcrm/booking/controllers/BookingController.java @@ -1,11 +1,10 @@ package com.mgm.mcrm.booking.controllers; -import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.stream.Collectors; - +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.auth0.jwt.JWT; import com.mgm.mcrm.approval.service.ApprovalService; +import com.mgm.mcrm.appsetting.models.CfgSettings; import com.mgm.mcrm.appsetting.services.SettingService; import com.mgm.mcrm.appsetting.services.SysSettingService; import com.mgm.mcrm.authorization.dtos.LoginUserInfo; @@ -15,26 +14,33 @@ import com.mgm.mcrm.authorization.services.SysGroupPermissionService; import com.mgm.mcrm.authorization.utils.JwtTokenUtil; import com.mgm.mcrm.basesetting.daylight.dtos.response.ProfileDetailResponse; import com.mgm.mcrm.basesetting.daylight.services.DaylightService; +import com.mgm.mcrm.booking.dtos.BookingDto; import com.mgm.mcrm.booking.dtos.daylight.requests.ChangeMiscChargeRequest; import com.mgm.mcrm.booking.dtos.search.*; -import com.mgm.mcrm.booking.dtos.BookingDto; import com.mgm.mcrm.booking.models.Bookings; import com.mgm.mcrm.booking.models.BookingsView; import com.mgm.mcrm.booking.models.GamingData; import com.mgm.mcrm.booking.services.*; import com.mgm.mcrm.booking.services.mockup.BookingServiceMockup; +import com.mgm.mcrm.common.annotation.logging.OperationLog; +import com.mgm.mcrm.common.constants.SysCommon; +import com.mgm.mcrm.common.constants.SysConstants; import com.mgm.mcrm.common.dtos.BaseApiResponse; +import com.mgm.mcrm.common.dtos.DataTableResult; import com.mgm.mcrm.common.dtos.data_import.ValidateResult; import com.mgm.mcrm.common.dtos.data_import.booking.OtherBookingImportRow; import com.mgm.mcrm.common.dtos.mgm_api.PlayerProfileEntry; import com.mgm.mcrm.common.dtos.mgm_api.UserInfoApiRecord; import com.mgm.mcrm.common.dtos.system.ResFileResult; -import com.mgm.mcrm.common.utils.*; +import com.mgm.mcrm.common.utils.DaoUtil; +import com.mgm.mcrm.common.utils.DateTimeUtil; +import com.mgm.mcrm.common.utils.ExcelUtils; +import com.mgm.mcrm.common.utils.LogUtil; +import com.mgm.mcrm.common.utils.mockup.AjaxResultMockup; import com.mgm.mcrm.player.services.PlayerService; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; - import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import org.apache.commons.lang3.StringUtils; @@ -47,15 +53,9 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.server.ResponseStatusException; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; - -import com.mgm.mcrm.common.constants.SysCommon; -import com.mgm.mcrm.common.constants.SysConstants; -import com.mgm.mcrm.common.annotation.logging.OperationLog; -import com.mgm.mcrm.common.utils.mockup.AjaxResultMockup; -import com.mgm.mcrm.appsetting.models.CfgSettings; -import com.mgm.mcrm.common.dtos.DataTableResult; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; @RestController @CrossOrigin(origins = "*") @@ -209,19 +209,20 @@ public class BookingController { HttpServletRequest request, @RequestBody GetBookingByIdRequest params) { Long bookingId = params.getId(); - - List list = new ArrayList<>(); + BaseApiResponse> result = new BaseApiResponse<>(); - result.setSuccess(false); - result.setData(list); + LoginUserInfo loginUser = SysCommon.parseUserFromToken(request); String userId = loginUser.getLoginId(); String groupName = loginUser.getGroupName(); //--get group permissions boolean viewBooking = sysGroupPermissionService.checkGroupPermission(groupName, "10001_01"); - - list = bookingService.getBookingById(bookingId); - + + List list = bookingService.getBookingById(bookingId); + + result.setSuccess(false); + result.setData(list); + if(!list.isEmpty() && StringUtils.isNotEmpty(userId)) { BaseApiResponse findPlayerProfileResult = playerService.findPlayerProfileByPlayerIdAndUserId(list.getFirst().getPlayerId(), userId); diff --git a/src/main/java/com/mgm/mcrm/booking/controllers/WaitlistController.java b/src/main/java/com/mgm/mcrm/booking/controllers/WaitlistController.java index baf56a2..7c3c1d8 100644 --- a/src/main/java/com/mgm/mcrm/booking/controllers/WaitlistController.java +++ b/src/main/java/com/mgm/mcrm/booking/controllers/WaitlistController.java @@ -3,20 +3,18 @@ package com.mgm.mcrm.booking.controllers; import com.mgm.mcrm.authorization.dtos.LoginUserInfo; import com.mgm.mcrm.booking.dtos.WebBatchUpdateWaitlistRequest; import com.mgm.mcrm.booking.models.Bookings; +import com.mgm.mcrm.booking.services.WaitlistBookingService; +import com.mgm.mcrm.common.annotation.logging.OperationLog; +import com.mgm.mcrm.common.constants.SysCommon; import com.mgm.mcrm.common.dtos.BaseApiResponse; +import com.mgm.mcrm.common.utils.LogUtil; +import com.mgm.mcrm.logging.services.SysLogOperationService; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; - import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import com.mgm.mcrm.common.constants.SysCommon; -import com.mgm.mcrm.common.annotation.logging.OperationLog; -import com.mgm.mcrm.booking.services.WaitlistBookingService; -import com.mgm.mcrm.logging.services.SysLogOperationService; -import com.mgm.mcrm.common.utils.LogUtil; - @RestController @CrossOrigin(origins = "*") diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/daylight/Breakdown.java b/src/main/java/com/mgm/mcrm/booking/dtos/daylight/Breakdown.java index 6b6ea33..a6fb68a 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/daylight/Breakdown.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/daylight/Breakdown.java @@ -4,7 +4,6 @@ import com.mgm.mcrm.player.dtos.BasePricePerDay; import com.mgm.mcrm.player.dtos.RatePricingDetail; import lombok.Data; -import java.util.Date; import java.util.List; @Data diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/CancelBookingRequest.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/CancelBookingRequest.java index 0a9ed8d..d6c97a8 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/CancelBookingRequest.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/CancelBookingRequest.java @@ -1,7 +1,5 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - public class CancelBookingRequest { private String transactionID; diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/CancelBookingResponse.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/CancelBookingResponse.java index 630e37b..3908d11 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/CancelBookingResponse.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/CancelBookingResponse.java @@ -1,8 +1,9 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.io.Serializable; import com.thoughtworks.xstream.annotations.XStreamAlias; +import java.io.Serializable; + @XStreamAlias("CancelBookingResponse") public class CancelBookingResponse implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/CombineShareRequest.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/CombineShareRequest.java index 1dc0633..02e4e5a 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/CombineShareRequest.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/CombineShareRequest.java @@ -1,9 +1,9 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.mgm.mcrm.basesetting.property.models.CfgProperties; +import java.util.List; + public class CombineShareRequest { private String transactionID; diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/CombineShareResponse.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/CombineShareResponse.java index e29d693..d14efdc 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/CombineShareResponse.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/CombineShareResponse.java @@ -1,9 +1,9 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.io.Serializable; - import com.thoughtworks.xstream.annotations.XStreamAlias; +import java.io.Serializable; + @XStreamAlias("CombineShareResponse") public class CombineShareResponse implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/CreateBookingRequest.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/CreateBookingRequest.java index c0092cf..535f394 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/CreateBookingRequest.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/CreateBookingRequest.java @@ -1,16 +1,14 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - -import com.mgm.mcrm.booking.services.BookingService; -import org.apache.commons.lang3.StringUtils; - import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; - import com.mgm.mcrm.booking.models.Bookings; +import com.mgm.mcrm.booking.services.BookingService; import com.mgm.mcrm.common.utils.DateTimeUtil; import com.mgm.mcrm.common.utils.LogUtil; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; public class CreateBookingRequest { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/CreateBookingResponse.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/CreateBookingResponse.java index 666fa4a..9b26dcc 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/CreateBookingResponse.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/CreateBookingResponse.java @@ -1,9 +1,9 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.io.Serializable; - import com.thoughtworks.xstream.annotations.XStreamAlias; +import java.io.Serializable; + @XStreamAlias("CreateBookingResponse") public class CreateBookingResponse implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/CreateBookingRoomTypeDescription.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/CreateBookingRoomTypeDescription.java index 6decf68..dfc4b21 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/CreateBookingRoomTypeDescription.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/CreateBookingRoomTypeDescription.java @@ -1,9 +1,6 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("RoomTypeDescription") public class CreateBookingRoomTypeDescription { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/CreateBookingUniqueIDList.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/CreateBookingUniqueIDList.java index c856de5..bb1ad57 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/CreateBookingUniqueIDList.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/CreateBookingUniqueIDList.java @@ -1,10 +1,10 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; +import java.util.List; + @XStreamAlias("UniqueIDList") public class CreateBookingUniqueIDList { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingAdditionalDetail.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingAdditionalDetail.java index 0e536e4..da43117 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingAdditionalDetail.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingAdditionalDetail.java @@ -1,9 +1,6 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("AdditionalDetail") public class FetchBookingAdditionalDetail { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingAdditionalDetailDescription.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingAdditionalDetailDescription.java index e7bd8c4..6ce753d 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingAdditionalDetailDescription.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingAdditionalDetailDescription.java @@ -1,9 +1,6 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("AdditionalDetailDescription") public class FetchBookingAdditionalDetailDescription { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingAdditionalDetails.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingAdditionalDetails.java index 54f7cc1..8a6dc24 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingAdditionalDetails.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingAdditionalDetails.java @@ -1,10 +1,10 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; +import java.util.List; + @XStreamAlias("AdditionalDetails") public class FetchBookingAdditionalDetails { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingArrivalTransport.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingArrivalTransport.java index efc59b3..fd78e5f 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingArrivalTransport.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingArrivalTransport.java @@ -1,10 +1,7 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamConverter; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("ArrivalTransport") public class FetchBookingArrivalTransport { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingCancelTerm.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingCancelTerm.java index ef8eb1a..6a9dfda 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingCancelTerm.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingCancelTerm.java @@ -1,11 +1,7 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamConverter; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("CancelTerm") public class FetchBookingCancelTerm { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingComment.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingComment.java index 7ebd8a8..f5aab97 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingComment.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingComment.java @@ -1,9 +1,6 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("Comment") public class FetchBookingComment { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingComments.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingComments.java index e3487ed..c8c85e9 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingComments.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingComments.java @@ -1,10 +1,10 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; +import java.util.List; + @XStreamAlias("Comments") public class FetchBookingComments { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingCompany.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingCompany.java index 1d118f3..9b6623e 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingCompany.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingCompany.java @@ -1,9 +1,6 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("Company") public class FetchBookingCompany { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingDepartureTransport.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingDepartureTransport.java index aa3c01c..95f83c0 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingDepartureTransport.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingDepartureTransport.java @@ -1,11 +1,7 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamConverter; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("DepartureTransport") public class FetchBookingDepartureTransport { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingExpectedCharges.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingExpectedCharges.java index 08c1133..a952787 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingExpectedCharges.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingExpectedCharges.java @@ -1,11 +1,11 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import com.thoughtworks.xstream.annotations.XStreamImplicit; +import java.util.List; + @XStreamAlias("ExpectedCharges") public class FetchBookingExpectedCharges { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingGuarantee.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingGuarantee.java index fd9e436..7b7bb9f 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingGuarantee.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingGuarantee.java @@ -1,11 +1,7 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamConverter; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("Guarantee") public class FetchBookingGuarantee { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingGuestCount.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingGuestCount.java index e012818..5e8a5e0 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingGuestCount.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingGuestCount.java @@ -1,10 +1,7 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("GuestCount") public class FetchBookingGuestCount { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingGuestCounts.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingGuestCounts.java index 4c76fb5..7d31896 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingGuestCounts.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingGuestCounts.java @@ -1,10 +1,10 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; +import java.util.List; + @XStreamAlias("GuestCounts") public class FetchBookingGuestCounts { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingNameAddress.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingNameAddress.java index 2d06778..77f9594 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingNameAddress.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingNameAddress.java @@ -1,9 +1,6 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("NameAddress") public class FetchBookingNameAddress { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingNameMembership.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingNameMembership.java index 1e4ea62..bd02c6c 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingNameMembership.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingNameMembership.java @@ -1,10 +1,7 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("NameMembership") public class FetchBookingNameMembership { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingNamePhone.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingNamePhone.java index 6bcec18..dd5f96f 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingNamePhone.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingNamePhone.java @@ -1,9 +1,6 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("NamePhone") public class FetchBookingNamePhone { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingOtherPayment.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingOtherPayment.java index d013f60..5b4c741 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingOtherPayment.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingOtherPayment.java @@ -1,11 +1,7 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamConverter; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("OtherPayment") public class FetchBookingOtherPayment { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingPersonName.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingPersonName.java index ad046cf..5d46b97 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingPersonName.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingPersonName.java @@ -1,9 +1,6 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("PersonName") public class FetchBookingPersonName { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingPhones.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingPhones.java index b156830..5c3c1cc 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingPhones.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingPhones.java @@ -1,10 +1,10 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; +import java.util.List; + @XStreamAlias("Phones") public class FetchBookingPhones { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingProfileIDs.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingProfileIDs.java index f159863..b73e2ae 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingProfileIDs.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingProfileIDs.java @@ -1,9 +1,6 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("ProfileIDs") public class FetchBookingProfileIDs { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingProfiles.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingProfiles.java index 642d850..476e926 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingProfiles.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingProfiles.java @@ -1,10 +1,10 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; +import java.util.List; + @XStreamAlias("Profiles") public class FetchBookingProfiles { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRatePlanDescription.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRatePlanDescription.java index bb19aae..2288035 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRatePlanDescription.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRatePlanDescription.java @@ -1,9 +1,6 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("RatePlanDescription") public class FetchBookingRatePlanDescription { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingResGuestRPH.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingResGuestRPH.java index 4feaec0..c715927 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingResGuestRPH.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingResGuestRPH.java @@ -1,10 +1,7 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("ResGuestRPH") public class FetchBookingResGuestRPH { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingReservationGuarantee.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingReservationGuarantee.java index ad043e6..f16ffc8 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingReservationGuarantee.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingReservationGuarantee.java @@ -1,11 +1,7 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamConverter; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("ReservationGuarantee") public class FetchBookingReservationGuarantee { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingReservationHistory.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingReservationHistory.java index 83fac73..bd8b216 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingReservationHistory.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingReservationHistory.java @@ -1,10 +1,7 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("ReservationHistory") public class FetchBookingReservationHistory { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingReservationPaymentInfo.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingReservationPaymentInfo.java index dd2dc0e..d2d5667 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingReservationPaymentInfo.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingReservationPaymentInfo.java @@ -1,11 +1,7 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamConverter; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("ReservationPaymentInfo") public class FetchBookingReservationPaymentInfo { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingResponse.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingResponse.java index f6a33eb..377b8e5 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingResponse.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingResponse.java @@ -1,9 +1,9 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.io.Serializable; - import com.thoughtworks.xstream.annotations.XStreamAlias; +import java.io.Serializable; + @XStreamAlias("FetchBookingResponse") public class FetchBookingResponse implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomRateAndPackages.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomRateAndPackages.java index 1a35166..b883bf0 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomRateAndPackages.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomRateAndPackages.java @@ -1,11 +1,11 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import com.thoughtworks.xstream.annotations.XStreamImplicit; +import java.util.List; + @XStreamAlias("RoomRateAndPackages") public class FetchBookingRoomRateAndPackages { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomRates.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomRates.java index ff52a80..eef3b34 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomRates.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomRates.java @@ -1,10 +1,10 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; +import java.util.List; + @XStreamAlias("RoomRates") public class FetchBookingRoomRates { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomToChargeDescription.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomToChargeDescription.java index 0905896..9d58168 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomToChargeDescription.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomToChargeDescription.java @@ -1,9 +1,6 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("RoomToChargeDescription") public class FetchBookingRoomToChargeDescription { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomToChargeShortDescription.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomToChargeShortDescription.java index f0efff8..afa89a8 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomToChargeShortDescription.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomToChargeShortDescription.java @@ -1,9 +1,6 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("RoomToChargeShortDescription") public class FetchBookingRoomToChargeShortDescription { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomTypeDescription.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomTypeDescription.java index 1dc5296..42a26f1 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomTypeDescription.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomTypeDescription.java @@ -1,9 +1,6 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("RoomTypeDescription") public class FetchBookingRoomTypeDescription { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomTypeShortDescription.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomTypeShortDescription.java index 13cab4d..999af97 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomTypeShortDescription.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingRoomTypeShortDescription.java @@ -1,9 +1,6 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("RoomTypeShortDescription") public class FetchBookingRoomTypeShortDescription { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingShareReservations.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingShareReservations.java index 3711110..d105373 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingShareReservations.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingShareReservations.java @@ -1,10 +1,10 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; +import java.util.List; + @XStreamAlias("ShareReservations") public class FetchBookingShareReservations { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingTaxesAndFees.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingTaxesAndFees.java index 1d16404..f622cef 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingTaxesAndFees.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingTaxesAndFees.java @@ -1,11 +1,11 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import com.thoughtworks.xstream.annotations.XStreamImplicit; +import java.util.List; + @XStreamAlias("TaxesAndFees") public class FetchBookingTaxesAndFees { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingText.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingText.java index 87bae54..46a875c 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingText.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingText.java @@ -1,10 +1,7 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("Text") public class FetchBookingText { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingTimeSpan.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingTimeSpan.java index 4340cc5..f0d5db7 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingTimeSpan.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingTimeSpan.java @@ -1,9 +1,6 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("TimeSpan") public class FetchBookingTimeSpan { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingUniqueIDList.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingUniqueIDList.java index ba936bb..86bb2ef 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingUniqueIDList.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingUniqueIDList.java @@ -1,10 +1,10 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; +import java.util.List; + @XStreamAlias("UniqueIDList") public class FetchBookingUniqueIDList { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingUserDefinedValue.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingUserDefinedValue.java index 70643fc..b4b6dfa 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingUserDefinedValue.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingUserDefinedValue.java @@ -1,11 +1,7 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamConverter; -import com.thoughtworks.xstream.annotations.XStreamImplicit; @XStreamAlias("UserDefinedValue") public class FetchBookingUserDefinedValue { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingUserDefinedValues.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingUserDefinedValues.java index 465cfe9..c25e756 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingUserDefinedValues.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/FetchBookingUserDefinedValues.java @@ -1,10 +1,10 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; +import java.util.List; + @XStreamAlias("UserDefinedValues") public class FetchBookingUserDefinedValues { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/GuestRequestsRequest.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/GuestRequestsRequest.java index e1d1799..0f618ce 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/GuestRequestsRequest.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/GuestRequestsRequest.java @@ -1,22 +1,14 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.ArrayList; -import java.util.List; +import com.mgm.mcrm.basesetting.property.models.CfgProperties; +import com.mgm.mcrm.booking.dtos.opera.schema.*; +import com.mgm.mcrm.common.utils.SOAPUtil; +import jakarta.xml.soap.SOAPMessage; +import lombok.Data; import javax.xml.namespace.QName; -import jakarta.xml.soap.SOAPMessage; - -import com.mgm.mcrm.basesetting.property.models.CfgProperties; -import com.mgm.mcrm.booking.dtos.opera.schema.Comment; -import com.mgm.mcrm.booking.dtos.opera.schema.ConfirmationNumber; -import com.mgm.mcrm.booking.dtos.opera.schema.GuestRequest; -import com.mgm.mcrm.booking.dtos.opera.schema.GuestRequestMsg; -import com.mgm.mcrm.booking.dtos.opera.schema.HotelReference; -import com.mgm.mcrm.booking.dtos.opera.schema.OGHeader; -import com.mgm.mcrm.booking.dtos.opera.schema.SpecialRequest; -import com.mgm.mcrm.booking.dtos.opera.schema.Trace; -import com.mgm.mcrm.common.utils.SOAPUtil; -import lombok.Data; +import java.util.ArrayList; +import java.util.List; @Data public class GuestRequestsRequest { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/GuestRequestsResponse.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/GuestRequestsResponse.java index dc8aefb..5dacec8 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/GuestRequestsResponse.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/GuestRequestsResponse.java @@ -1,9 +1,9 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.io.Serializable; - import com.thoughtworks.xstream.annotations.XStreamAlias; +import java.io.Serializable; + @XStreamAlias("GuestRequestsResponse") public class GuestRequestsResponse implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/InsertGuestCardRequest.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/InsertGuestCardRequest.java index fde61b2..55b3c28 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/InsertGuestCardRequest.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/InsertGuestCardRequest.java @@ -1,7 +1,5 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - public class InsertGuestCardRequest { private String transactionID; diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/InsertGuestCardResponse.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/InsertGuestCardResponse.java index acbd56e..8765cee 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/InsertGuestCardResponse.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/InsertGuestCardResponse.java @@ -1,8 +1,9 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.io.Serializable; import com.thoughtworks.xstream.annotations.XStreamAlias; +import java.io.Serializable; + @XStreamAlias("InsertGuestCardResponse") public class InsertGuestCardResponse implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/ModifyBookingRequest.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/ModifyBookingRequest.java index 4832a42..798171c 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/ModifyBookingRequest.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/ModifyBookingRequest.java @@ -1,9 +1,8 @@ package com.mgm.mcrm.booking.dtos.opera; import com.alibaba.fastjson.JSONObject; - -import com.mgm.mcrm.booking.models.Bookings; import com.mgm.mcrm.basesetting.property.models.CfgProperties; +import com.mgm.mcrm.booking.models.Bookings; import com.mgm.mcrm.common.utils.DateTimeUtil; import lombok.Data; diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/UpdatePassportRequest.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/UpdatePassportRequest.java index 37ca6d6..b6dc930 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/UpdatePassportRequest.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/UpdatePassportRequest.java @@ -1,7 +1,5 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.util.List; - public class UpdatePassportRequest { private String transactionID; diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/UpdatePassportResponse.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/UpdatePassportResponse.java index 4595888..5b35b09 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/UpdatePassportResponse.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/UpdatePassportResponse.java @@ -1,8 +1,9 @@ package com.mgm.mcrm.booking.dtos.opera; -import java.io.Serializable; import com.thoughtworks.xstream.annotations.XStreamAlias; +import java.io.Serializable; + @XStreamAlias("UpdatePassportResponse") public class UpdatePassportResponse implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/schema/GuestRequest.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/schema/GuestRequest.java index da0e346..6e06065 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/schema/GuestRequest.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/schema/GuestRequest.java @@ -1,11 +1,12 @@ package com.mgm.mcrm.booking.dtos.opera.schema; -import java.util.List; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlElementWrapper; import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlType; +import java.util.List; + @XmlRootElement(name="GuestRequestsRequest",namespace="http://webservices.micros.com/og/4.3/HotelCommon/") @XmlType(propOrder = { "comments", diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/opera/schema/GuestRequestMsg.java b/src/main/java/com/mgm/mcrm/booking/dtos/opera/schema/GuestRequestMsg.java index 5c2b0cc..f7960b6 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/opera/schema/GuestRequestMsg.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/opera/schema/GuestRequestMsg.java @@ -1,11 +1,11 @@ package com.mgm.mcrm.booking.dtos.opera.schema; -import java.util.List; - import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlType; +import java.util.List; + @XmlRootElement(name="GuestRequestsRequest",namespace="http://webservices.micros.com/ows/5.1/Reservation.wsdl") @XmlType(propOrder = { "hotelReference", diff --git a/src/main/java/com/mgm/mcrm/booking/dtos/search/GetBookingByNameIdRequest.java b/src/main/java/com/mgm/mcrm/booking/dtos/search/GetBookingByNameIdRequest.java index cdb50bc..9b6f6ef 100644 --- a/src/main/java/com/mgm/mcrm/booking/dtos/search/GetBookingByNameIdRequest.java +++ b/src/main/java/com/mgm/mcrm/booking/dtos/search/GetBookingByNameIdRequest.java @@ -2,7 +2,6 @@ package com.mgm.mcrm.booking.dtos.search; import lombok.Data; -import java.util.ArrayList; import java.util.List; @Data diff --git a/src/main/java/com/mgm/mcrm/booking/models/Bookings.java b/src/main/java/com/mgm/mcrm/booking/models/Bookings.java index e6ac8b1..9ee924c 100644 --- a/src/main/java/com/mgm/mcrm/booking/models/Bookings.java +++ b/src/main/java/com/mgm/mcrm/booking/models/Bookings.java @@ -1,20 +1,13 @@ package com.mgm.mcrm.booking.models; -import java.io.Serializable; -import java.util.Date; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import jakarta.persistence.Transient; - import com.alibaba.fastjson.JSONArray; import com.fasterxml.jackson.annotation.JsonFormat; +import jakarta.persistence.*; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + @Data @Entity @Table(name="bookings") diff --git a/src/main/java/com/mgm/mcrm/booking/models/BookingsView.java b/src/main/java/com/mgm/mcrm/booking/models/BookingsView.java index beaf7d4..f8ae8a8 100644 --- a/src/main/java/com/mgm/mcrm/booking/models/BookingsView.java +++ b/src/main/java/com/mgm/mcrm/booking/models/BookingsView.java @@ -1,25 +1,15 @@ package com.mgm.mcrm.booking.models; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.NamedEntityGraph; -import jakarta.persistence.NamedEntityGraphs; -import jakarta.persistence.Table; -import jakarta.persistence.Transient; - -import lombok.Data; -import org.hibernate.annotations.Immutable; - import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.annotation.JsonFormat; +import jakarta.persistence.*; +import lombok.Data; +import org.hibernate.annotations.Immutable; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; @Data @Entity diff --git a/src/main/java/com/mgm/mcrm/booking/models/CfgBookingTypes.java b/src/main/java/com/mgm/mcrm/booking/models/CfgBookingTypes.java index 28ff57c..0f07087 100644 --- a/src/main/java/com/mgm/mcrm/booking/models/CfgBookingTypes.java +++ b/src/main/java/com/mgm/mcrm/booking/models/CfgBookingTypes.java @@ -1,15 +1,10 @@ package com.mgm.mcrm.booking.models; +import jakarta.persistence.*; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - @Entity @Table(name="cfg_booking_types") public class CfgBookingTypes implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/booking/models/GamingData.java b/src/main/java/com/mgm/mcrm/booking/models/GamingData.java index 3200fd7..c8caecf 100644 --- a/src/main/java/com/mgm/mcrm/booking/models/GamingData.java +++ b/src/main/java/com/mgm/mcrm/booking/models/GamingData.java @@ -1,13 +1,8 @@ package com.mgm.mcrm.booking.models; -import java.util.Date; +import jakarta.persistence.*; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; +import java.util.Date; @Entity @Table(name="gaming_data") diff --git a/src/main/java/com/mgm/mcrm/booking/models/NonMGMBookings.java b/src/main/java/com/mgm/mcrm/booking/models/NonMGMBookings.java index 2d7cdb8..59d208f 100644 --- a/src/main/java/com/mgm/mcrm/booking/models/NonMGMBookings.java +++ b/src/main/java/com/mgm/mcrm/booking/models/NonMGMBookings.java @@ -1,13 +1,8 @@ package com.mgm.mcrm.booking.models; -import java.util.Date; +import jakarta.persistence.*; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; +import java.util.Date; @Entity @Table(name="non_mgm_bookings") diff --git a/src/main/java/com/mgm/mcrm/booking/models/OWSTransactions.java b/src/main/java/com/mgm/mcrm/booking/models/OWSTransactions.java index 9f0343d..124c85c 100644 --- a/src/main/java/com/mgm/mcrm/booking/models/OWSTransactions.java +++ b/src/main/java/com/mgm/mcrm/booking/models/OWSTransactions.java @@ -1,18 +1,12 @@ package com.mgm.mcrm.booking.models; +import com.fasterxml.jackson.annotation.JsonFormat; +import jakarta.persistence.*; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - @Data @Entity @Table(name = "ows_transactions") diff --git a/src/main/java/com/mgm/mcrm/booking/models/OperaDBBooking.java b/src/main/java/com/mgm/mcrm/booking/models/OperaDBBooking.java index 59bcfb5..48c5c89 100644 --- a/src/main/java/com/mgm/mcrm/booking/models/OperaDBBooking.java +++ b/src/main/java/com/mgm/mcrm/booking/models/OperaDBBooking.java @@ -1,10 +1,10 @@ package com.mgm.mcrm.booking.models; -import java.sql.Date; - import jakarta.persistence.*; +import java.sql.Date; + @Entity @NamedStoredProcedureQueries({ @NamedStoredProcedureQuery( diff --git a/src/main/java/com/mgm/mcrm/booking/repositories/BookingDao.java b/src/main/java/com/mgm/mcrm/booking/repositories/BookingDao.java index 4593949..56dc23e 100644 --- a/src/main/java/com/mgm/mcrm/booking/repositories/BookingDao.java +++ b/src/main/java/com/mgm/mcrm/booking/repositories/BookingDao.java @@ -1,9 +1,6 @@ package com.mgm.mcrm.booking.repositories; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - +import com.mgm.mcrm.booking.models.Bookings; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -14,7 +11,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import com.mgm.mcrm.booking.models.Bookings; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; @Repository public interface BookingDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/booking/repositories/BookingTypeDao.java b/src/main/java/com/mgm/mcrm/booking/repositories/BookingTypeDao.java index b24c8a6..d2deeb8 100644 --- a/src/main/java/com/mgm/mcrm/booking/repositories/BookingTypeDao.java +++ b/src/main/java/com/mgm/mcrm/booking/repositories/BookingTypeDao.java @@ -1,15 +1,13 @@ package com.mgm.mcrm.booking.repositories; -import java.util.List; - +import com.mgm.mcrm.booking.models.CfgBookingTypes; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import com.mgm.mcrm.booking.models.CfgBookingTypes; +import java.util.List; diff --git a/src/main/java/com/mgm/mcrm/booking/repositories/BookingViewDao.java b/src/main/java/com/mgm/mcrm/booking/repositories/BookingViewDao.java index 1052d59..ffaa036 100644 --- a/src/main/java/com/mgm/mcrm/booking/repositories/BookingViewDao.java +++ b/src/main/java/com/mgm/mcrm/booking/repositories/BookingViewDao.java @@ -1,8 +1,5 @@ package com.mgm.mcrm.booking.repositories; -import java.util.Date; -import java.util.List; - import com.mgm.mcrm.booking.models.BookingsView; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -15,6 +12,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; +import java.util.List; + public interface BookingViewDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/booking/repositories/GamingDataDao.java b/src/main/java/com/mgm/mcrm/booking/repositories/GamingDataDao.java index 751030c..9560fe3 100644 --- a/src/main/java/com/mgm/mcrm/booking/repositories/GamingDataDao.java +++ b/src/main/java/com/mgm/mcrm/booking/repositories/GamingDataDao.java @@ -1,12 +1,9 @@ package com.mgm.mcrm.booking.repositories; -import java.util.List; - import com.mgm.mcrm.booking.models.GamingData; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.transaction.annotation.Transactional; + +import java.util.List; public interface GamingDataDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/booking/repositories/NonMGMBookingDao.java b/src/main/java/com/mgm/mcrm/booking/repositories/NonMGMBookingDao.java index 4829c4d..28605d3 100644 --- a/src/main/java/com/mgm/mcrm/booking/repositories/NonMGMBookingDao.java +++ b/src/main/java/com/mgm/mcrm/booking/repositories/NonMGMBookingDao.java @@ -1,15 +1,14 @@ package com.mgm.mcrm.booking.repositories; -import java.util.List; - +import com.mgm.mcrm.booking.models.Bookings; +import com.mgm.mcrm.booking.models.NonMGMBookings; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; -import com.mgm.mcrm.booking.models.Bookings; -import com.mgm.mcrm.booking.models.NonMGMBookings; +import java.util.List; public interface NonMGMBookingDao extends JpaRepository{ diff --git a/src/main/java/com/mgm/mcrm/booking/repositories/NonMGMStatusMappingDao.java b/src/main/java/com/mgm/mcrm/booking/repositories/NonMGMStatusMappingDao.java index 8fbdb65..533fdb8 100644 --- a/src/main/java/com/mgm/mcrm/booking/repositories/NonMGMStatusMappingDao.java +++ b/src/main/java/com/mgm/mcrm/booking/repositories/NonMGMStatusMappingDao.java @@ -1,14 +1,13 @@ package com.mgm.mcrm.booking.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.daylight.models.CfgNonMGMStatusMapping; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; -import com.mgm.mcrm.basesetting.daylight.models.CfgNonMGMStatusMapping; +import java.util.List; public interface NonMGMStatusMappingDao extends JpaRepository { List findAll(Specification spec,Sort sort); diff --git a/src/main/java/com/mgm/mcrm/booking/repositories/OWSTransactionsRepository.java b/src/main/java/com/mgm/mcrm/booking/repositories/OWSTransactionsRepository.java index 74e41b2..dbb4ce2 100644 --- a/src/main/java/com/mgm/mcrm/booking/repositories/OWSTransactionsRepository.java +++ b/src/main/java/com/mgm/mcrm/booking/repositories/OWSTransactionsRepository.java @@ -7,7 +7,7 @@ import org.springframework.data.jpa.repository.Query; -public interface OWSTransactionsRepository extends JpaRepository { +public interface OWSTransactionsRepository extends JpaRepository { @Query(value="select top 1 * from ows_transactions with (nolock) order by id desc",nativeQuery=true) OWSTransactions findMaxId(); diff --git a/src/main/java/com/mgm/mcrm/booking/repositories/OtherAppChannelDao.java b/src/main/java/com/mgm/mcrm/booking/repositories/OtherAppChannelDao.java index 10ad431..070aef4 100644 --- a/src/main/java/com/mgm/mcrm/booking/repositories/OtherAppChannelDao.java +++ b/src/main/java/com/mgm/mcrm/booking/repositories/OtherAppChannelDao.java @@ -3,9 +3,6 @@ package com.mgm.mcrm.booking.repositories; import com.mgm.mcrm.allotment.models.CfgOtherAppChannel; import com.mgm.mcrm.allotment.models.CfgOtherAppChannelKey; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/mgm/mcrm/booking/repositories/OtherFollowUpStatusDao.java b/src/main/java/com/mgm/mcrm/booking/repositories/OtherFollowUpStatusDao.java index c07210f..14d0298 100644 --- a/src/main/java/com/mgm/mcrm/booking/repositories/OtherFollowUpStatusDao.java +++ b/src/main/java/com/mgm/mcrm/booking/repositories/OtherFollowUpStatusDao.java @@ -1,12 +1,11 @@ package com.mgm.mcrm.booking.repositories; -import java.util.List; - +import com.mgm.mcrm.basesetting.daylight.models.CfgOtherFollowUpStatus; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; -import com.mgm.mcrm.basesetting.daylight.models.CfgOtherFollowUpStatus; +import java.util.List; public interface OtherFollowUpStatusDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/booking/services/BookingService.java b/src/main/java/com/mgm/mcrm/booking/services/BookingService.java index 53681d5..140d133 100644 --- a/src/main/java/com/mgm/mcrm/booking/services/BookingService.java +++ b/src/main/java/com/mgm/mcrm/booking/services/BookingService.java @@ -29,7 +29,10 @@ import com.mgm.mcrm.basesetting.property.repositories.PropertyDao; import com.mgm.mcrm.basesetting.property.services.PropertyCache; import com.mgm.mcrm.basesetting.room.models.*; import com.mgm.mcrm.basesetting.room.repositories.*; -import com.mgm.mcrm.booking.dtos.*; +import com.mgm.mcrm.booking.dtos.BookingCancelInfo; +import com.mgm.mcrm.booking.dtos.BookingDateEntry; +import com.mgm.mcrm.booking.dtos.BookingDto; +import com.mgm.mcrm.booking.dtos.BookingUserEntry; import com.mgm.mcrm.booking.dtos.daylight.requests.createReservation.*; import com.mgm.mcrm.booking.dtos.daylight.responses.DistributionChannelResponse; import com.mgm.mcrm.booking.dtos.daylight.responses.GuaranteeTypeResponse; @@ -46,7 +49,10 @@ import com.mgm.mcrm.common.constants.SysConstants; import com.mgm.mcrm.common.dtos.BaseApiResponse; import com.mgm.mcrm.common.dtos.DataTableResult; import com.mgm.mcrm.common.dtos.EumnApprovalStatus; -import com.mgm.mcrm.common.dtos.mgm_api.*; +import com.mgm.mcrm.common.dtos.mgm_api.ApproverRecordResult; +import com.mgm.mcrm.common.dtos.mgm_api.ApproverResult; +import com.mgm.mcrm.common.dtos.mgm_api.PlayerProfileEntry; +import com.mgm.mcrm.common.dtos.mgm_api.UserInfoApiRecord; import com.mgm.mcrm.common.jms.BookingControlMsgSender; import com.mgm.mcrm.common.utils.DaoUtil; import com.mgm.mcrm.common.utils.DateTimeUtil; @@ -475,7 +481,7 @@ public class BookingService { booking.setDateList(JSONArray.toJSONString(dateArray)); String routingReason = param.getRoutingReason(); CfgBookingTypes cfgBookingType = bookingTypeDao.findCfgBookingTypesById(param.getBookingTypeId()); - CfgRooms room = roomDao.findById(roomId); + CfgRooms room = roomDao.findById(roomId).orElse(null); GetApproverRequest approverRequest = new GetApproverRequest(); approverRequest.setBookingType(cfgBookingType.getName()); approverRequest.setPlayerId(playerId); @@ -608,7 +614,7 @@ public class BookingService { Date checkoutDate = DateTimeUtil.getDateFromString(dateArr.getLast(), "yyyy-MM-dd"); String checkinDateStr = DateTimeUtil.getDateByFormat(checkinDate, "yyyy-MM-dd"); String checkoutDateStr = DateTimeUtil.getDateByFormat(checkoutDate, "yyyy-MM-dd"); - CfgRooms room = roomDao.findById(param.getRoomId()); + CfgRooms room = roomDao.findById(param.getRoomId()).orElse(null); List roomRoomType = room.getRoomRoomType(); for (CfgRoomTypes type : roomRoomType) { @@ -1182,7 +1188,7 @@ public class BookingService { } } - CfgRoomTypes roomType = roomTypeDao.findById(bookings.getRoomTypeId()); + CfgRoomTypes roomType = roomTypeDao.findById(bookings.getRoomTypeId()).orElse(null); // if (roomType == null) { // bookings.setApproveStatus("F"); // bookings.setErrorMessage("Room Type not found"); @@ -1811,9 +1817,9 @@ public class BookingService { updateBooking.setRoomTypeId(daylightRoomType.getId()); updateBooking.setRoomTypeCode(daylightBooking.getRoomTypeCode()); List roomroomType = roomRoomTypeDao.findByRoomTypeId(daylightRoomType.getId()); - if(roomroomType.size()>0) { + if(!roomroomType.isEmpty()) { for(CfgRoomsRoomTypes r:roomroomType) { - CfgRooms room = roomDao.findById(r.getRoomId()); + CfgRooms room = roomDao.findById(r.getRoomId()).orElse(null); if(room!=null) { if(Long.valueOf(room.getPropertyId()).equals(updateBooking.getPropertyId())) { updateBooking.setRoom(room.getName()); @@ -2329,7 +2335,7 @@ public class BookingService { booking.setOperaComment(newComment); - CfgProperties pp = propertyDao.findById(String.valueOf(booking.getPropertyId())).orElse(null); + CfgProperties pp = propertyDao.findById(booking.getPropertyId()).orElse(null); BaseApiResponse response = dlService.daylightGetNoteListById(pp.getDlPropertyId(), booking.getDlReservationId()); @@ -2670,7 +2676,7 @@ public class BookingService { List roomroomType = roomRoomTypeDao.findByRoomTypeId(operRoomType.getId()); if(!roomroomType.isEmpty()) { for(CfgRoomsRoomTypes r:roomroomType) { - CfgRooms room = roomDao.findById(r.getRoomId()); + CfgRooms room = roomDao.findById(r.getRoomId()).orElse(null); if(room!=null) { if(Long.valueOf(room.getPropertyId()).equals(updateBooking.getPropertyId())) { updateBooking.setRoom(room.getName()); @@ -2828,7 +2834,7 @@ public class BookingService { List roomroomType = roomRoomTypeDao.findByRoomTypeId(operRoomType.getId()); if(!roomroomType.isEmpty()) { for(CfgRoomsRoomTypes r:roomroomType) { - CfgRooms room = roomDao.findById(r.getRoomId()); + CfgRooms room = roomDao.findById(r.getRoomId()).orElse(null); if(room!=null) { if(Objects.equals(Long.valueOf(room.getPropertyId()), operaProperty.getId())) { operaRoom = room; @@ -2985,7 +2991,7 @@ public class BookingService { List roomroomType = roomRoomTypeDao.findByRoomTypeId(operRoomType.getId()); if(!roomroomType.isEmpty()) { for(CfgRoomsRoomTypes r:roomroomType) { - CfgRooms room = roomDao.findById(r.getRoomId()); + CfgRooms room = roomDao.findById(r.getRoomId()).orElse(null); if(room!=null) { if(Long.valueOf(room.getPropertyId()).equals(operaProperty.getId())) { operaRoom = room; @@ -4765,7 +4771,7 @@ public class BookingService { List roomRoomType = roomRoomTypeDao.findByRoomTypeId(daylightRoomType.getId()); if (!roomRoomType.isEmpty()) { for (CfgRoomsRoomTypes r : roomRoomType) { - CfgRooms room = roomDao.findById(r.getRoomId()); + CfgRooms room = roomDao.findById(r.getRoomId()).orElse(null); if (room != null) { if (Long.valueOf(room.getPropertyId()).equals(dbBookingView.getPropertyId())) { daylightBooking.setRoom(room.getName()); @@ -4905,7 +4911,7 @@ public class BookingService { List roomRoomTypes = roomRoomTypeDao.findByRoomTypeId(roomTypeId); if(!roomRoomTypes.isEmpty()) { for(CfgRoomsRoomTypes r:roomRoomTypes) { - CfgRooms room = roomDao.findById(r.getRoomId()); + CfgRooms room = roomDao.findById(r.getRoomId()).orElse(null); if(room!=null) { if(Long.valueOf(room.getPropertyId()).equals(propertyId)) { roomId = room.getId(); @@ -5257,7 +5263,7 @@ public class BookingService { List roomroomType = roomRoomTypeDao.findByRoomTypeId(operRoomType.getId()); if (!roomroomType.isEmpty()) { for (CfgRoomsRoomTypes r : roomroomType) { - CfgRooms room = roomDao.findById(r.getRoomId()); + CfgRooms room = roomDao.findById(r.getRoomId()).orElse(null); if (room != null) { if (Long.valueOf(room.getPropertyId()).equals(dbBooking.getPropertyId())) { operaBooking.setRoom(room.getName()); @@ -5395,7 +5401,7 @@ public class BookingService { List roomRoomTypes = roomRoomTypeDao.findByRoomTypeId(roomTypeId); if(!roomRoomTypes.isEmpty()) { for(CfgRoomsRoomTypes r:roomRoomTypes) { - CfgRooms room = roomDao.findById(r.getRoomId()); + CfgRooms room = roomDao.findById(r.getRoomId()).orElse(null); if(room!=null) { if(Long.valueOf(room.getPropertyId()).equals(operaProperty.getId())) { roomId = room.getId(); diff --git a/src/main/java/com/mgm/mcrm/booking/services/NonMGMBookingService.java b/src/main/java/com/mgm/mcrm/booking/services/NonMGMBookingService.java index e2e9f88..31eff52 100644 --- a/src/main/java/com/mgm/mcrm/booking/services/NonMGMBookingService.java +++ b/src/main/java/com/mgm/mcrm/booking/services/NonMGMBookingService.java @@ -1,22 +1,29 @@ package com.mgm.mcrm.booking.services; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.auth0.jwt.JWT; +import com.auth0.jwt.interfaces.DecodedJWT; import com.mgm.mcrm.allotment.models.CfgOtherAllotment; import com.mgm.mcrm.allotment.models.CfgOtherAppChannel; +import com.mgm.mcrm.allotment.repositories.OtherAllotmentDao; import com.mgm.mcrm.approval.dtos.GetApproverRequest; import com.mgm.mcrm.approval.service.ApprovalService; import com.mgm.mcrm.appsetting.models.CfgSettings; +import com.mgm.mcrm.appsetting.services.SettingService; +import com.mgm.mcrm.authorization.services.MgmUserService; import com.mgm.mcrm.basesetting.daylight.models.*; +import com.mgm.mcrm.basesetting.daylight.repositories.MarketCodeDao; +import com.mgm.mcrm.basesetting.daylight.repositories.OtherSegmentDao; +import com.mgm.mcrm.basesetting.daylight.repositories.SourceCodeDao; import com.mgm.mcrm.basesetting.property.models.CfgProperties; +import com.mgm.mcrm.basesetting.property.repositories.PropertyDao; import com.mgm.mcrm.basesetting.room.models.CfgOtherRoomStatus; import com.mgm.mcrm.basesetting.room.models.CfgRooms; +import com.mgm.mcrm.basesetting.room.repositories.OtherRoomStatusDao; +import com.mgm.mcrm.basesetting.room.repositories.RoomDao; import com.mgm.mcrm.basesetting.team.models.CfgOtherUserMapping; +import com.mgm.mcrm.basesetting.team.repositories.OtherUserMappingDao; import com.mgm.mcrm.booking.dtos.BookingDateEntry; import com.mgm.mcrm.booking.dtos.BookingDto; import com.mgm.mcrm.booking.mappers.BookingMapper; @@ -25,15 +32,24 @@ import com.mgm.mcrm.booking.models.BookingsView; import com.mgm.mcrm.booking.models.CfgBookingTypes; import com.mgm.mcrm.booking.models.NonMGMBookings; import com.mgm.mcrm.booking.repositories.*; +import com.mgm.mcrm.common.constants.SysConstants; import com.mgm.mcrm.common.dtos.BaseApiResponse; +import com.mgm.mcrm.common.dtos.data_import.ValidateResult; +import com.mgm.mcrm.common.dtos.data_import.booking.OtherBookingImportRow; +import com.mgm.mcrm.common.dtos.excel_model.ImportDefine; import com.mgm.mcrm.common.dtos.mgm_api.*; import com.mgm.mcrm.common.enums.EnumBookingStatus; import com.mgm.mcrm.common.services.MGMApiService; +import com.mgm.mcrm.common.utils.DateTimeUtil; +import com.mgm.mcrm.common.utils.ExcelUtils; import com.mgm.mcrm.common.utils.LogUtil; +import com.mgm.mcrm.common.utils.NetworkUtil; import com.mgm.mcrm.logging.models.SysLogOperation; +import com.mgm.mcrm.logging.services.SysLogBookingService; +import com.mgm.mcrm.logging.services.SysLogOperationService; +import com.mgm.mcrm.player.services.PlayerService; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; - import jakarta.transaction.Transactional; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Strings; @@ -41,31 +57,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.auth0.jwt.JWT; -import com.auth0.jwt.interfaces.DecodedJWT; - -import com.mgm.mcrm.common.utils.DateTimeUtil; -import com.mgm.mcrm.common.utils.ExcelUtils; -import com.mgm.mcrm.common.utils.NetworkUtil; -import com.mgm.mcrm.common.constants.SysConstants; -import com.mgm.mcrm.basesetting.daylight.repositories.MarketCodeDao; -import com.mgm.mcrm.allotment.repositories.OtherAllotmentDao; -import com.mgm.mcrm.basesetting.room.repositories.OtherRoomStatusDao; -import com.mgm.mcrm.basesetting.daylight.repositories.OtherSegmentDao; -import com.mgm.mcrm.basesetting.team.repositories.OtherUserMappingDao; -import com.mgm.mcrm.basesetting.property.repositories.PropertyDao; -import com.mgm.mcrm.basesetting.room.repositories.RoomDao; -import com.mgm.mcrm.basesetting.daylight.repositories.SourceCodeDao; -import com.mgm.mcrm.common.dtos.data_import.ValidateResult; -import com.mgm.mcrm.common.dtos.data_import.booking.OtherBookingImportRow; -import com.mgm.mcrm.common.dtos.excel_model.ImportDefine; -import com.mgm.mcrm.player.services.PlayerService; -import com.mgm.mcrm.appsetting.services.SettingService; -import com.mgm.mcrm.authorization.services.MgmUserService; -import com.mgm.mcrm.logging.services.SysLogBookingService; -import com.mgm.mcrm.logging.services.SysLogOperationService; +import java.util.*; @Service @@ -234,7 +226,7 @@ public class NonMGMBookingService { //TODO Add ApprovalRouting Logic String checkinDateStr = DateTimeUtil.getDateByFormat(checkinDate, "yyyy-MM-dd"); String checkoutDateStr = DateTimeUtil.getDateByFormat(checkoutDate, "yyyy-MM-dd"); - CfgRooms room = roomDao.findById(param.getRoomId()); + CfgRooms room = roomDao.findById(param.getRoomId()).orElse(null); boolean isWaitlist = dateItem.getStatus() != null && dateItem.getStatus() == 1; boolean isApproval = param.getIsApproval() != null && param.getIsApproval() == 1; @@ -383,7 +375,7 @@ public class NonMGMBookingService { booking.setCheckoutDate(nonMGMBooking.getCheckOutDate()); booking.setRoomId(nonMGMBooking.getRoomId()); if(nonMGMBooking.getRoomId()!=null) { - CfgRooms roomObj = roomDao.findById(nonMGMBooking.getRoomId()); + CfgRooms roomObj = roomDao.findById(nonMGMBooking.getRoomId()).orElse(null); if(roomObj!=null) { booking.setRoomCategory(roomObj.getRoomCategory()); } diff --git a/src/main/java/com/mgm/mcrm/booking/services/OWSTransactionsService.java b/src/main/java/com/mgm/mcrm/booking/services/OWSTransactionsService.java index ccbcbd7..f46503e 100644 --- a/src/main/java/com/mgm/mcrm/booking/services/OWSTransactionsService.java +++ b/src/main/java/com/mgm/mcrm/booking/services/OWSTransactionsService.java @@ -1,11 +1,9 @@ package com.mgm.mcrm.booking.services; import com.mgm.mcrm.booking.models.OWSTransactions; -import jakarta.annotation.Resource; - -import org.springframework.stereotype.Service; - import com.mgm.mcrm.booking.repositories.OWSTransactionsRepository; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; diff --git a/src/main/java/com/mgm/mcrm/booking/services/OperaDBBookingService.java b/src/main/java/com/mgm/mcrm/booking/services/OperaDBBookingService.java index a894a09..1ee16c1 100644 --- a/src/main/java/com/mgm/mcrm/booking/services/OperaDBBookingService.java +++ b/src/main/java/com/mgm/mcrm/booking/services/OperaDBBookingService.java @@ -1,7 +1,4 @@ package com.mgm.mcrm.booking.services; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; import com.mgm.mcrm.booking.dtos.BookingDto; import com.mgm.mcrm.booking.models.BookingsView; @@ -9,17 +6,19 @@ import com.mgm.mcrm.booking.models.OperaComment; import com.mgm.mcrm.booking.models.OperaDBBooking; import com.mgm.mcrm.booking.models.OperaDBRate; import com.mgm.mcrm.common.enums.EnumBookingStatus; +import com.mgm.mcrm.common.utils.DateTimeUtil; import com.mgm.mcrm.common.utils.LogUtil; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.StoredProcedureQuery; - import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; -import com.mgm.mcrm.common.utils.DateTimeUtil; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; @Service diff --git a/src/main/java/com/mgm/mcrm/booking/services/OperaService.java b/src/main/java/com/mgm/mcrm/booking/services/OperaService.java index f334a33..ec8044a 100644 --- a/src/main/java/com/mgm/mcrm/booking/services/OperaService.java +++ b/src/main/java/com/mgm/mcrm/booking/services/OperaService.java @@ -1,52 +1,33 @@ package com.mgm.mcrm.booking.services; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import com.mgm.mcrm.booking.models.BookingsView; -import jakarta.annotation.Resource; -import javax.xml.XMLConstants; -import jakarta.xml.soap.SOAPMessage; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.Strings; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; - -import com.mgm.mcrm.common.constants.SysCommon; -import com.mgm.mcrm.booking.models.Bookings; -import com.mgm.mcrm.booking.dtos.opera.CancelBookingRequest; -import com.mgm.mcrm.booking.dtos.opera.CancelBookingResponse; -import com.mgm.mcrm.booking.dtos.opera.CombineShareRequest; -import com.mgm.mcrm.booking.dtos.opera.CombineShareResponse; -import com.mgm.mcrm.booking.dtos.opera.CreateBookingRequest; -import com.mgm.mcrm.booking.dtos.opera.CreateBookingResponse; -import com.mgm.mcrm.booking.dtos.opera.FetchBookingHotelReservation; -import com.mgm.mcrm.booking.dtos.opera.FetchBookingRequest; -import com.mgm.mcrm.booking.dtos.opera.FetchBookingResponse; -import com.mgm.mcrm.booking.dtos.opera.FetchBookingShareReservationDetails; -import com.mgm.mcrm.booking.dtos.opera.GuestRequestsRequest; -import com.mgm.mcrm.booking.dtos.opera.GuestRequestsResponse; -import com.mgm.mcrm.booking.dtos.opera.InsertGuestCardRequest; -import com.mgm.mcrm.booking.dtos.opera.InsertGuestCardResponse; -import com.mgm.mcrm.booking.dtos.opera.ModifyBookingRequest; -import com.mgm.mcrm.booking.dtos.opera.ModifyBookingResponse; -import com.mgm.mcrm.booking.models.OWSTransactions; -import com.mgm.mcrm.booking.dtos.opera.UpdatePassportRequest; -import com.mgm.mcrm.booking.dtos.opera.UpdatePassportResponse; import com.mgm.mcrm.appsetting.services.SysSettingService; +import com.mgm.mcrm.booking.dtos.opera.*; +import com.mgm.mcrm.booking.models.Bookings; +import com.mgm.mcrm.booking.models.BookingsView; +import com.mgm.mcrm.booking.models.OWSTransactions; +import com.mgm.mcrm.common.constants.SysCommon; import com.mgm.mcrm.common.utils.DateTimeUtil; import com.mgm.mcrm.common.utils.LogUtil; import com.mgm.mcrm.common.utils.SOAPUtil; import com.mgm.mcrm.common.utils.XMLBuliderUtil; +import jakarta.annotation.Resource; +import jakarta.xml.soap.SOAPMessage; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Strings; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.xml.XMLConstants; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; @Service diff --git a/src/main/java/com/mgm/mcrm/booking/services/WaitlistBookingService.java b/src/main/java/com/mgm/mcrm/booking/services/WaitlistBookingService.java index e17c533..009c818 100644 --- a/src/main/java/com/mgm/mcrm/booking/services/WaitlistBookingService.java +++ b/src/main/java/com/mgm/mcrm/booking/services/WaitlistBookingService.java @@ -1,62 +1,56 @@ package com.mgm.mcrm.booking.services; -import java.util.*; - +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.parser.Feature; +import com.google.gson.Gson; import com.mgm.mcrm.allotment.models.CfgAppChannel; import com.mgm.mcrm.allotment.models.CfgOtherAllotment; import com.mgm.mcrm.allotment.models.CfgOtherAppChannel; import com.mgm.mcrm.allotment.models.CfgRoomCriterias; import com.mgm.mcrm.allotment.repositories.OtherAllotmentDao; +import com.mgm.mcrm.allotment.repositories.RoomCriteriaDao; import com.mgm.mcrm.appsetting.models.CfgSettings; import com.mgm.mcrm.appsetting.services.SettingService; import com.mgm.mcrm.authorization.dtos.LoginUserInfo; import com.mgm.mcrm.authorization.services.MgmUserService; import com.mgm.mcrm.basesetting.property.models.CfgProperties; import com.mgm.mcrm.basesetting.property.repositories.PropertyDao; +import com.mgm.mcrm.basesetting.room.repositories.OtherRoomStatusDao; import com.mgm.mcrm.booking.dtos.BookingDto; import com.mgm.mcrm.booking.mappers.BookingMapper; import com.mgm.mcrm.booking.models.Bookings; import com.mgm.mcrm.booking.models.BookingsView; import com.mgm.mcrm.booking.models.GamingData; +import com.mgm.mcrm.booking.repositories.BookingDao; +import com.mgm.mcrm.booking.repositories.BookingViewDao; +import com.mgm.mcrm.booking.repositories.GamingDataDao; +import com.mgm.mcrm.common.constants.SysCommon; +import com.mgm.mcrm.common.constants.SysConstants; import com.mgm.mcrm.common.dtos.BaseApiResponse; import com.mgm.mcrm.common.dtos.EumnApprovalStatus; +import com.mgm.mcrm.common.dtos.http_util.HttpResponseResult; +import com.mgm.mcrm.common.dtos.mgm_api.*; +import com.mgm.mcrm.common.jms.BookingControlMsgSender; import com.mgm.mcrm.common.services.MGMApiService; +import com.mgm.mcrm.common.utils.DateTimeUtil; +import com.mgm.mcrm.common.utils.LogUtil; +import com.mgm.mcrm.common.utils.SendEmail; +import com.mgm.mcrm.logging.services.SysLogBookingService; import com.mgm.mcrm.notification.models.Email; +import com.mgm.mcrm.notification.repositories.EmailDao; import com.mgm.mcrm.player.services.PlayerService; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; - import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Strings; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.parser.Feature; -import com.google.gson.Gson; - -import com.mgm.mcrm.common.utils.DateTimeUtil; -import com.mgm.mcrm.common.utils.LogUtil; -import com.mgm.mcrm.common.utils.SendEmail; -import com.mgm.mcrm.common.constants.SysCommon; -import com.mgm.mcrm.common.constants.SysConstants; -import com.mgm.mcrm.booking.repositories.BookingDao; -import com.mgm.mcrm.booking.repositories.BookingViewDao; -import com.mgm.mcrm.notification.repositories.EmailDao; -import com.mgm.mcrm.booking.repositories.GamingDataDao; -import com.mgm.mcrm.basesetting.room.repositories.OtherRoomStatusDao; -import com.mgm.mcrm.allotment.repositories.RoomCriteriaDao; -import com.mgm.mcrm.common.jms.BookingControlMsgSender; - -import com.mgm.mcrm.common.dtos.http_util.HttpResponseResult; -import com.mgm.mcrm.common.dtos.mgm_api.PlayerProfileEntry; -import com.mgm.mcrm.common.dtos.mgm_api.UserInfoApiRecord; -import com.mgm.mcrm.common.dtos.mgm_api.WaitlistBookingApiResult; -import com.mgm.mcrm.common.dtos.mgm_api.WaitlistBookingRecord; -import com.mgm.mcrm.common.dtos.mgm_api.WaitlistDataApiResult; -import com.mgm.mcrm.common.dtos.mgm_api.WaitlistDataRecord; -import com.mgm.mcrm.logging.services.SysLogBookingService; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Set; @Service public class WaitlistBookingService { diff --git a/src/main/java/com/mgm/mcrm/common/config/DataSourceConfig.java b/src/main/java/com/mgm/mcrm/common/config/DataSourceConfig.java index 0077631..6671209 100644 --- a/src/main/java/com/mgm/mcrm/common/config/DataSourceConfig.java +++ b/src/main/java/com/mgm/mcrm/common/config/DataSourceConfig.java @@ -1,7 +1,5 @@ package com.mgm.mcrm.common.config; -import javax.sql.DataSource; - import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.jdbc.DataSourceBuilder; @@ -9,6 +7,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; +import javax.sql.DataSource; + /** * @Description: 数据源配置 */ diff --git a/src/main/java/com/mgm/mcrm/common/config/JMSConfig.java b/src/main/java/com/mgm/mcrm/common/config/JMSConfig.java index 53bbc44..286d5b0 100644 --- a/src/main/java/com/mgm/mcrm/common/config/JMSConfig.java +++ b/src/main/java/com/mgm/mcrm/common/config/JMSConfig.java @@ -1,18 +1,16 @@ package com.mgm.mcrm.common.config; -import java.net.ConnectException; - +import com.mgm.mcrm.common.constants.SysCommon; import jakarta.jms.ConnectionFactory; import jakarta.jms.ExceptionListener; import jakarta.jms.JMSException; - import org.apache.activemq.ActiveMQConnectionFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jms.config.DefaultJmsListenerContainerFactory; -import com.mgm.mcrm.common.constants.SysCommon; +import java.net.ConnectException; @Configuration public class JMSConfig { diff --git a/src/main/java/com/mgm/mcrm/common/config/MGMDataSourceConfig.java b/src/main/java/com/mgm/mcrm/common/config/MGMDataSourceConfig.java index c3f13fb..9275b52 100644 --- a/src/main/java/com/mgm/mcrm/common/config/MGMDataSourceConfig.java +++ b/src/main/java/com/mgm/mcrm/common/config/MGMDataSourceConfig.java @@ -1,11 +1,7 @@ package com.mgm.mcrm.common.config; -import java.util.Map; - import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; -import javax.sql.DataSource; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties; @@ -22,6 +18,8 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; +import javax.sql.DataSource; + /** * @Description: 主数据源配置 * @date diff --git a/src/main/java/com/mgm/mcrm/common/config/OperaDataSourceConfig.java b/src/main/java/com/mgm/mcrm/common/config/OperaDataSourceConfig.java index 7b826b9..22f52cf 100644 --- a/src/main/java/com/mgm/mcrm/common/config/OperaDataSourceConfig.java +++ b/src/main/java/com/mgm/mcrm/common/config/OperaDataSourceConfig.java @@ -1,11 +1,7 @@ package com.mgm.mcrm.common.config; -import java.util.Map; - import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; -import javax.sql.DataSource; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties; @@ -15,13 +11,14 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; +import javax.sql.DataSource; + /** * @Description: 副数据源配置 * @date diff --git a/src/main/java/com/mgm/mcrm/common/constants/SysCommon.java b/src/main/java/com/mgm/mcrm/common/constants/SysCommon.java index 3f304a1..73fc7af 100644 --- a/src/main/java/com/mgm/mcrm/common/constants/SysCommon.java +++ b/src/main/java/com/mgm/mcrm/common/constants/SysCommon.java @@ -1,27 +1,21 @@ package com.mgm.mcrm.common.constants; -import java.io.BufferedInputStream; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.lang.reflect.Field; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; - +import com.alibaba.fastjson.JSONObject; +import com.auth0.jwt.JWT; +import com.auth0.jwt.interfaces.DecodedJWT; +import com.mgm.mcrm.appsetting.models.SysSetting; import com.mgm.mcrm.authorization.dtos.LoginUserInfo; import com.mgm.mcrm.authorization.models.SysUser; -import com.mgm.mcrm.authorization.models.SysUserView; +import com.mgm.mcrm.booking.services.BookingService; +import com.mgm.mcrm.common.dtos.config.APIConfig; +import com.mgm.mcrm.common.dtos.msg.AppSettingMsgData; +import com.mgm.mcrm.common.dtos.msg.UpdateCfgItem; +import com.mgm.mcrm.common.dtos.system.AppServerState; +import com.mgm.mcrm.common.utils.LogUtil; +import com.mgm.mcrm.common.utils.NetworkUtil; +import com.mgm.mcrm.logging.models.SysLogLogin; +import com.mgm.mcrm.logging.models.SysLogOperation; import jakarta.servlet.http.HttpServletRequest; - import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Strings; import org.springframework.boot.system.ApplicationHome; @@ -30,20 +24,10 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.web.servlet.support.RequestContextUtils; -import com.alibaba.fastjson.JSONObject; -import com.auth0.jwt.JWT; -import com.auth0.jwt.interfaces.DecodedJWT; - -import com.mgm.mcrm.logging.models.SysLogLogin; -import com.mgm.mcrm.logging.models.SysLogOperation; -import com.mgm.mcrm.appsetting.models.SysSetting; -import com.mgm.mcrm.common.dtos.config.APIConfig; -import com.mgm.mcrm.common.dtos.msg.AppSettingMsgData; -import com.mgm.mcrm.common.dtos.msg.UpdateCfgItem; -import com.mgm.mcrm.common.dtos.system.AppServerState; -import com.mgm.mcrm.booking.services.BookingService; -import com.mgm.mcrm.common.utils.LogUtil; -import com.mgm.mcrm.common.utils.NetworkUtil; +import java.io.*; +import java.lang.reflect.Field; +import java.text.SimpleDateFormat; +import java.util.*; public class SysCommon { diff --git a/src/main/java/com/mgm/mcrm/common/constants/SysConstants.java b/src/main/java/com/mgm/mcrm/common/constants/SysConstants.java index ec9079c..77c32bd 100644 --- a/src/main/java/com/mgm/mcrm/common/constants/SysConstants.java +++ b/src/main/java/com/mgm/mcrm/common/constants/SysConstants.java @@ -1,7 +1,5 @@ package com.mgm.mcrm.common.constants; -import org.apache.commons.lang3.StringUtils; - public class SysConstants { public static final String CURRENT_USER_KEY = "currentUser"; diff --git a/src/main/java/com/mgm/mcrm/common/dtos/excel_model/RowFieldInfo.java b/src/main/java/com/mgm/mcrm/common/dtos/excel_model/RowFieldInfo.java index efb0e79..e7d6c4d 100644 --- a/src/main/java/com/mgm/mcrm/common/dtos/excel_model/RowFieldInfo.java +++ b/src/main/java/com/mgm/mcrm/common/dtos/excel_model/RowFieldInfo.java @@ -1,9 +1,9 @@ package com.mgm.mcrm.common.dtos.excel_model; -import java.lang.reflect.Field; - import org.apache.poi.xssf.usermodel.XSSFCellStyle; +import java.lang.reflect.Field; + public class RowFieldInfo { private String fieldKey; private Field dataField=null; diff --git a/src/main/java/com/mgm/mcrm/common/dtos/http_util/HttpRequestDefine.java b/src/main/java/com/mgm/mcrm/common/dtos/http_util/HttpRequestDefine.java index 5048842..7be0e47 100644 --- a/src/main/java/com/mgm/mcrm/common/dtos/http_util/HttpRequestDefine.java +++ b/src/main/java/com/mgm/mcrm/common/dtos/http_util/HttpRequestDefine.java @@ -1,11 +1,11 @@ package com.mgm.mcrm.common.dtos.http_util; -import java.util.Map; - import org.apache.hc.client5.http.auth.CredentialsProvider; import org.apache.hc.core5.http.HttpEntity; import org.springframework.web.multipart.MultipartFile; +import java.util.Map; + public class HttpRequestDefine { diff --git a/src/main/java/com/mgm/mcrm/common/dtos/mgm_api/PlayerTPDApiResult.java b/src/main/java/com/mgm/mcrm/common/dtos/mgm_api/PlayerTPDApiResult.java index 26d243f..9d1786c 100644 --- a/src/main/java/com/mgm/mcrm/common/dtos/mgm_api/PlayerTPDApiResult.java +++ b/src/main/java/com/mgm/mcrm/common/dtos/mgm_api/PlayerTPDApiResult.java @@ -1,12 +1,11 @@ package com.mgm.mcrm.common.dtos.mgm_api; +import com.alibaba.fastjson.JSONObject; +import com.mgm.mcrm.player.dtos.PlayerTPD; + import java.util.ArrayList; import java.util.List; -import com.alibaba.fastjson.JSONObject; - -import com.mgm.mcrm.player.dtos.PlayerTPD; - public class PlayerTPDApiResult { diff --git a/src/main/java/com/mgm/mcrm/common/dtos/mgm_api/TodoDetailDescription.java b/src/main/java/com/mgm/mcrm/common/dtos/mgm_api/TodoDetailDescription.java index 0ce3fb7..9d77d56 100644 --- a/src/main/java/com/mgm/mcrm/common/dtos/mgm_api/TodoDetailDescription.java +++ b/src/main/java/com/mgm/mcrm/common/dtos/mgm_api/TodoDetailDescription.java @@ -7,11 +7,20 @@ public class TodoDetailDescription { private String ItemRecordType = null; private Integer ItemRecordId = null; private String ItemRecordDescription = null; + private String roomNumber = null; public TodoDetailDescription() { } + public String getRoomNumber() { + return roomNumber; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + public String getItemRecordType() { return ItemRecordType; } diff --git a/src/main/java/com/mgm/mcrm/common/dtos/mgm_api/TodoDetailResult.java b/src/main/java/com/mgm/mcrm/common/dtos/mgm_api/TodoDetailResult.java index a75e3ea..7dc07a4 100644 --- a/src/main/java/com/mgm/mcrm/common/dtos/mgm_api/TodoDetailResult.java +++ b/src/main/java/com/mgm/mcrm/common/dtos/mgm_api/TodoDetailResult.java @@ -1,12 +1,11 @@ package com.mgm.mcrm.common.dtos.mgm_api; -import java.util.ArrayList; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; +import java.util.ArrayList; import java.util.Date; +import java.util.List; @Data public class TodoDetailResult { diff --git a/src/main/java/com/mgm/mcrm/common/dtos/system/RouterPages.java b/src/main/java/com/mgm/mcrm/common/dtos/system/RouterPages.java index 18e81e5..5a4b170 100644 --- a/src/main/java/com/mgm/mcrm/common/dtos/system/RouterPages.java +++ b/src/main/java/com/mgm/mcrm/common/dtos/system/RouterPages.java @@ -3,7 +3,6 @@ package com.mgm.mcrm.common.dtos.system; import com.mgm.mcrm.authorization.models.SysRouter; import java.io.Serializable; -import java.sql.Date; import java.util.List; diff --git a/src/main/java/com/mgm/mcrm/common/httpclient/HttpClientExecutor.java b/src/main/java/com/mgm/mcrm/common/httpclient/HttpClientExecutor.java index 5e0006f..8926160 100644 --- a/src/main/java/com/mgm/mcrm/common/httpclient/HttpClientExecutor.java +++ b/src/main/java/com/mgm/mcrm/common/httpclient/HttpClientExecutor.java @@ -2,11 +2,7 @@ package com.mgm.mcrm.common.httpclient; import com.mgm.mcrm.common.dtos.HttpResult; import com.mgm.mcrm.common.enums.HttpMethods; -import org.apache.hc.client5.http.classic.methods.HttpDelete; -import org.apache.hc.client5.http.classic.methods.HttpGet; -import org.apache.hc.client5.http.classic.methods.HttpPatch; -import org.apache.hc.client5.http.classic.methods.HttpPost; -import org.apache.hc.client5.http.classic.methods.HttpPut; +import org.apache.hc.client5.http.classic.methods.*; import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.Header; diff --git a/src/main/java/com/mgm/mcrm/common/interceptor/ControllerLogAspector.java b/src/main/java/com/mgm/mcrm/common/interceptor/ControllerLogAspector.java index e6c67f4..78eb1d6 100644 --- a/src/main/java/com/mgm/mcrm/common/interceptor/ControllerLogAspector.java +++ b/src/main/java/com/mgm/mcrm/common/interceptor/ControllerLogAspector.java @@ -1,11 +1,15 @@ package com.mgm.mcrm.common.interceptor; -import java.lang.reflect.Method; - +import com.mgm.mcrm.common.annotation.logging.OperationLog; +import com.mgm.mcrm.common.constants.SysCommon; import com.mgm.mcrm.common.dtos.BaseApiResponse; +import com.mgm.mcrm.common.utils.LogUtil; +import com.mgm.mcrm.logging.models.SysLogLogin; +import com.mgm.mcrm.logging.models.SysLogOperation; +import com.mgm.mcrm.logging.services.SysLogLoginService; +import com.mgm.mcrm.logging.services.SysLogOperationService; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; - import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.Signature; @@ -19,13 +23,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import com.mgm.mcrm.common.constants.SysCommon; -import com.mgm.mcrm.common.annotation.logging.OperationLog; -import com.mgm.mcrm.logging.models.SysLogOperation; -import com.mgm.mcrm.logging.models.SysLogLogin; -import com.mgm.mcrm.logging.services.SysLogOperationService; -import com.mgm.mcrm.logging.services.SysLogLoginService; -import com.mgm.mcrm.common.utils.LogUtil; +import java.lang.reflect.Method; @Aspect // 表示一个切面bean @Component // bean容器的组件注解。虽然放在contrller包里，但它不是控制器。如果注入service,但我们又没有放在service包里 diff --git a/src/main/java/com/mgm/mcrm/common/jms/AppControlMsgConsumer.java b/src/main/java/com/mgm/mcrm/common/jms/AppControlMsgConsumer.java index 2fd4d01..fc0b15c 100644 --- a/src/main/java/com/mgm/mcrm/common/jms/AppControlMsgConsumer.java +++ b/src/main/java/com/mgm/mcrm/common/jms/AppControlMsgConsumer.java @@ -1,19 +1,16 @@ package com.mgm.mcrm.common.jms; -import jakarta.annotation.Resource; - -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.Strings; -import org.springframework.jms.annotation.JmsListener; -import org.springframework.stereotype.Component; - import com.alibaba.fastjson2.JSONObject; - import com.mgm.mcrm.common.constants.SysCommon; import com.mgm.mcrm.common.dtos.msg.AppSettingMsgData; import com.mgm.mcrm.common.dtos.msg.JMSTextMessage; import com.mgm.mcrm.common.dtos.system.AppServerState; import com.mgm.mcrm.common.services.SysServerStateService; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.Strings; +import org.springframework.jms.annotation.JmsListener; +import org.springframework.stereotype.Component; @Slf4j @Component diff --git a/src/main/java/com/mgm/mcrm/common/jms/AppControlMsgSender.java b/src/main/java/com/mgm/mcrm/common/jms/AppControlMsgSender.java index cc5174d..f40988c 100644 --- a/src/main/java/com/mgm/mcrm/common/jms/AppControlMsgSender.java +++ b/src/main/java/com/mgm/mcrm/common/jms/AppControlMsgSender.java @@ -1,16 +1,14 @@ package com.mgm.mcrm.common.jms; +import com.alibaba.fastjson2.JSON; +import com.mgm.mcrm.common.dtos.msg.JMSTextMessage; +import com.mgm.mcrm.common.utils.LogUtil; import org.apache.activemq.command.ActiveMQTopic; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.jms.core.JmsTemplate; import org.springframework.stereotype.Component; -import com.alibaba.fastjson2.JSON; - -import com.mgm.mcrm.common.dtos.msg.JMSTextMessage; -import com.mgm.mcrm.common.utils.LogUtil; - @Component public class AppControlMsgSender { diff --git a/src/main/java/com/mgm/mcrm/common/jms/BookingControlMsgConsumer.java b/src/main/java/com/mgm/mcrm/common/jms/BookingControlMsgConsumer.java index b2a985a..4713c5d 100644 --- a/src/main/java/com/mgm/mcrm/common/jms/BookingControlMsgConsumer.java +++ b/src/main/java/com/mgm/mcrm/common/jms/BookingControlMsgConsumer.java @@ -1,20 +1,17 @@ package com.mgm.mcrm.common.jms; import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.mgm.mcrm.booking.dtos.BookingDto; import com.mgm.mcrm.booking.models.Bookings; +import com.mgm.mcrm.booking.repositories.BookingDao; +import com.mgm.mcrm.booking.services.BookingService; +import com.mgm.mcrm.common.dtos.msg.JMSTextMessage; import jakarta.annotation.Resource; - import lombok.extern.slf4j.Slf4j; import org.springframework.jms.annotation.JmsListener; import org.springframework.stereotype.Component; -import com.alibaba.fastjson2.JSONObject; - -import com.mgm.mcrm.booking.repositories.BookingDao; -import com.mgm.mcrm.common.dtos.msg.JMSTextMessage; -import com.mgm.mcrm.booking.services.BookingService; - import java.util.List; @Slf4j diff --git a/src/main/java/com/mgm/mcrm/common/jms/BookingControlMsgSender.java b/src/main/java/com/mgm/mcrm/common/jms/BookingControlMsgSender.java index 022a4fc..4c4ff2a 100644 --- a/src/main/java/com/mgm/mcrm/common/jms/BookingControlMsgSender.java +++ b/src/main/java/com/mgm/mcrm/common/jms/BookingControlMsgSender.java @@ -1,16 +1,14 @@ package com.mgm.mcrm.common.jms; +import com.alibaba.fastjson2.JSON; +import com.mgm.mcrm.common.dtos.msg.JMSTextMessage; +import com.mgm.mcrm.common.utils.LogUtil; import org.apache.activemq.command.ActiveMQQueue; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.jms.core.JmsTemplate; import org.springframework.stereotype.Component; -import com.alibaba.fastjson2.JSON; - -import com.mgm.mcrm.common.dtos.msg.JMSTextMessage; -import com.mgm.mcrm.common.utils.LogUtil; - @Component public class BookingControlMsgSender { diff --git a/src/main/java/com/mgm/mcrm/common/listener/ConfigListener.java b/src/main/java/com/mgm/mcrm/common/listener/ConfigListener.java index 37c19c9..7b56b3e 100644 --- a/src/main/java/com/mgm/mcrm/common/listener/ConfigListener.java +++ b/src/main/java/com/mgm/mcrm/common/listener/ConfigListener.java @@ -1,9 +1,13 @@ package com.mgm.mcrm.common.listener; -import java.util.List; - +import com.mgm.mcrm.appsetting.models.SysSetting; +import com.mgm.mcrm.appsetting.services.SysSettingService; +import com.mgm.mcrm.common.constants.SysCommon; +import com.mgm.mcrm.common.dtos.system.AppServerState; +import com.mgm.mcrm.common.jms.AppControlMsgSender; +import com.mgm.mcrm.common.utils.ExcelUtils; +import com.mgm.mcrm.common.utils.NetworkUtil; import jakarta.annotation.Resource; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.event.ApplicationStartedEvent; @@ -11,13 +15,7 @@ import org.springframework.context.ApplicationListener; import org.springframework.context.MessageSource; import org.springframework.stereotype.Component; -import com.mgm.mcrm.common.constants.SysCommon; -import com.mgm.mcrm.common.jms.AppControlMsgSender; -import com.mgm.mcrm.appsetting.models.SysSetting; -import com.mgm.mcrm.common.dtos.system.AppServerState; -import com.mgm.mcrm.appsetting.services.SysSettingService; -import com.mgm.mcrm.common.utils.ExcelUtils; -import com.mgm.mcrm.common.utils.NetworkUtil; +import java.util.List; @Component public class ConfigListener implements ApplicationListener { diff --git a/src/main/java/com/mgm/mcrm/common/schedule/AppSystemScheduleJob.java b/src/main/java/com/mgm/mcrm/common/schedule/AppSystemScheduleJob.java index 0040a5b..c124fab 100644 --- a/src/main/java/com/mgm/mcrm/common/schedule/AppSystemScheduleJob.java +++ b/src/main/java/com/mgm/mcrm/common/schedule/AppSystemScheduleJob.java @@ -1,13 +1,12 @@ package com.mgm.mcrm.common.schedule; +import com.mgm.mcrm.common.constants.SysCommon; +import com.mgm.mcrm.common.services.SysServerStateService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import com.mgm.mcrm.common.constants.SysCommon; -import com.mgm.mcrm.common.services.SysServerStateService; - @Component public class AppSystemScheduleJob { diff --git a/src/main/java/com/mgm/mcrm/common/schedule/BookingScheduleJob.java b/src/main/java/com/mgm/mcrm/common/schedule/BookingScheduleJob.java index 6d65bd6..7eb6380 100644 --- a/src/main/java/com/mgm/mcrm/common/schedule/BookingScheduleJob.java +++ b/src/main/java/com/mgm/mcrm/common/schedule/BookingScheduleJob.java @@ -1,27 +1,21 @@ package com.mgm.mcrm.common.schedule; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - import com.mgm.mcrm.appsetting.models.CfgSettings; +import com.mgm.mcrm.appsetting.services.SettingService; import com.mgm.mcrm.booking.models.Bookings; import com.mgm.mcrm.booking.models.GamingData; import com.mgm.mcrm.booking.services.BookingService; +import com.mgm.mcrm.booking.services.WaitlistBookingService; +import com.mgm.mcrm.common.jms.BookingControlMsgSender; +import com.mgm.mcrm.common.utils.DateTimeUtil; import jakarta.annotation.Resource; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import com.mgm.mcrm.booking.repositories.BookingDao; -import com.mgm.mcrm.booking.repositories.GamingDataDao; -import com.mgm.mcrm.common.jms.BookingControlMsgSender; -//import com.mgm.mcrm.booking.services.BookingService; -import com.mgm.mcrm.notification.services.EmailTemplateService; -import com.mgm.mcrm.appsetting.services.SettingService; -import com.mgm.mcrm.booking.services.WaitlistBookingService; -import com.mgm.mcrm.common.utils.DateTimeUtil; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; @Component public class BookingScheduleJob { diff --git a/src/main/java/com/mgm/mcrm/common/services/MGMApiService.java b/src/main/java/com/mgm/mcrm/common/services/MGMApiService.java index 5e02526..b714420 100644 --- a/src/main/java/com/mgm/mcrm/common/services/MGMApiService.java +++ b/src/main/java/com/mgm/mcrm/common/services/MGMApiService.java @@ -1,26 +1,24 @@ package com.mgm.mcrm.common.services; +import com.alibaba.fastjson.JSONObject; +import com.google.gson.Gson; +import com.mgm.mcrm.booking.dtos.search.DateRange; +import com.mgm.mcrm.common.constants.SysCommon; +import com.mgm.mcrm.common.dtos.http_util.HttpRequestDefine; +import com.mgm.mcrm.common.dtos.http_util.HttpResponseResult; +import com.mgm.mcrm.common.utils.DateTimeUtil; +import com.mgm.mcrm.common.utils.HttpUtil; +import com.mgm.mcrm.common.utils.LogUtil; +import com.mgm.mcrm.common.utils.mockup.HttpUtilMockup; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Strings; +import org.springframework.stereotype.Service; + import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.mgm.mcrm.booking.dtos.search.DateRange; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.Strings; -import org.springframework.stereotype.Service; - -import com.alibaba.fastjson.JSONObject; -import com.google.gson.Gson; - -import com.mgm.mcrm.common.dtos.http_util.HttpRequestDefine; -import com.mgm.mcrm.common.dtos.http_util.HttpResponseResult; -import com.mgm.mcrm.common.constants.SysCommon; -import com.mgm.mcrm.common.utils.DateTimeUtil; -import com.mgm.mcrm.common.utils.HttpUtil; -import com.mgm.mcrm.common.utils.LogUtil; -import com.mgm.mcrm.common.utils.mockup.HttpUtilMockup; - @Service public class MGMApiService { public static String ESB_APP_ID = ""; diff --git a/src/main/java/com/mgm/mcrm/common/services/SysServerStateService.java b/src/main/java/com/mgm/mcrm/common/services/SysServerStateService.java index 4981858..ec3d80b 100644 --- a/src/main/java/com/mgm/mcrm/common/services/SysServerStateService.java +++ b/src/main/java/com/mgm/mcrm/common/services/SysServerStateService.java @@ -1,12 +1,11 @@ package com.mgm.mcrm.common.services; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.mgm.mcrm.common.constants.SysCommon; -import com.mgm.mcrm.common.jms.AppControlMsgSender; import com.mgm.mcrm.common.dtos.msg.AppSettingMsgData; import com.mgm.mcrm.common.dtos.system.AppServerState; +import com.mgm.mcrm.common.jms.AppControlMsgSender; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; @Service public class SysServerStateService { diff --git a/src/main/java/com/mgm/mcrm/common/utils/ADFSUtil.java b/src/main/java/com/mgm/mcrm/common/utils/ADFSUtil.java index 149b1f8..8713a4b 100644 --- a/src/main/java/com/mgm/mcrm/common/utils/ADFSUtil.java +++ b/src/main/java/com/mgm/mcrm/common/utils/ADFSUtil.java @@ -1,16 +1,8 @@ package com.mgm.mcrm.common.utils; -import java.io.ByteArrayOutputStream; -import java.io.StringReader; -import java.util.Base64; -import java.util.List; -import java.util.zip.Inflater; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - +import com.auth0.jwt.JWT; +import com.auth0.jwt.interfaces.DecodedJWT; import com.mgm.mcrm.authorization.dtos.LoginUserInfo; -import com.mgm.mcrm.authorization.models.SysUserView; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Strings; import org.w3c.dom.Document; @@ -18,8 +10,13 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; import org.xml.sax.InputSource; -import com.auth0.jwt.JWT; -import com.auth0.jwt.interfaces.DecodedJWT; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import java.io.ByteArrayOutputStream; +import java.io.StringReader; +import java.util.Base64; +import java.util.List; +import java.util.zip.Inflater; public class ADFSUtil { diff --git a/src/main/java/com/mgm/mcrm/common/utils/AESUtil.java b/src/main/java/com/mgm/mcrm/common/utils/AESUtil.java index 14b3157..a4855cd 100644 --- a/src/main/java/com/mgm/mcrm/common/utils/AESUtil.java +++ b/src/main/java/com/mgm/mcrm/common/utils/AESUtil.java @@ -1,23 +1,18 @@ package com.mgm.mcrm.common.utils; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.Base64; -import java.util.Map; - import javax.crypto.Cipher; import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; import javax.crypto.spec.GCMParameterSpec; import javax.crypto.spec.SecretKeySpec; - +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.Permission; import java.security.PermissionCollection; import java.security.SecureRandom; - -import com.alibaba.fastjson.JSONObject; +import java.util.Map; public class AESUtil { diff --git a/src/main/java/com/mgm/mcrm/common/utils/DaoUtil.java b/src/main/java/com/mgm/mcrm/common/utils/DaoUtil.java index cb30e9a..1a4b5dc 100644 --- a/src/main/java/com/mgm/mcrm/common/utils/DaoUtil.java +++ b/src/main/java/com/mgm/mcrm/common/utils/DaoUtil.java @@ -1,11 +1,6 @@ package com.mgm.mcrm.common.utils; -import java.lang.reflect.Constructor; -import java.util.ArrayList; -import java.util.List; - import jakarta.persistence.EntityManager; - import lombok.Getter; import lombok.Setter; import org.apache.commons.lang3.StringUtils; @@ -13,6 +8,10 @@ import org.apache.commons.lang3.Strings; import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort.Direction; +import java.lang.reflect.Constructor; +import java.util.ArrayList; +import java.util.List; + @Getter @Setter diff --git a/src/main/java/com/mgm/mcrm/common/utils/DateTimeUtil.java b/src/main/java/com/mgm/mcrm/common/utils/DateTimeUtil.java index 4c302f7..59595ef 100644 --- a/src/main/java/com/mgm/mcrm/common/utils/DateTimeUtil.java +++ b/src/main/java/com/mgm/mcrm/common/utils/DateTimeUtil.java @@ -1,5 +1,10 @@ package com.mgm.mcrm.common.utils; +import com.mgm.mcrm.appsetting.services.SettingService; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + import java.text.SimpleDateFormat; import java.time.*; import java.time.format.DateTimeFormatter; @@ -8,13 +13,6 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; -import jakarta.annotation.Resource; - -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; - -import com.mgm.mcrm.appsetting.services.SettingService; - @Slf4j public class DateTimeUtil { diff --git a/src/main/java/com/mgm/mcrm/common/utils/EncryptUtil.java b/src/main/java/com/mgm/mcrm/common/utils/EncryptUtil.java index 0ee152a..7480689 100644 --- a/src/main/java/com/mgm/mcrm/common/utils/EncryptUtil.java +++ b/src/main/java/com/mgm/mcrm/common/utils/EncryptUtil.java @@ -1,10 +1,8 @@ package com.mgm.mcrm.common.utils; - + import java.nio.charset.StandardCharsets; import java.security.MessageDigest; - -import org.springframework.util.DigestUtils; public class EncryptUtil { diff --git a/src/main/java/com/mgm/mcrm/common/utils/ExcelUtils.java b/src/main/java/com/mgm/mcrm/common/utils/ExcelUtils.java index 56a0756..9bf6200 100644 --- a/src/main/java/com/mgm/mcrm/common/utils/ExcelUtils.java +++ b/src/main/java/com/mgm/mcrm/common/utils/ExcelUtils.java @@ -1,5 +1,23 @@ package com.mgm.mcrm.common.utils; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.parser.Feature; +import com.mgm.mcrm.common.constants.SysCommon; +import com.mgm.mcrm.common.dtos.BaseApiResponse; +import com.mgm.mcrm.common.dtos.excel_model.*; +import com.mgm.mcrm.common.dtos.system.ResFileResult; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Strings; +import org.apache.commons.text.StringEscapeUtils; +import org.apache.poi.hssf.usermodel.HSSFDataFormat; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.usermodel.*; +import org.springframework.web.multipart.MultipartFile; + import java.awt.Color; import java.io.File; import java.io.FileInputStream; @@ -9,56 +27,8 @@ import java.lang.reflect.Field; import java.text.SimpleDateFormat; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; +import java.util.*; import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.UUID; - -import com.mgm.mcrm.common.dtos.BaseApiResponse; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.Strings; -import org.apache.commons.text.StringEscapeUtils; -import org.apache.poi.hssf.usermodel.HSSFDataFormat; -import org.apache.poi.ss.usermodel.BuiltinFormats; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CellType; -import org.apache.poi.ss.usermodel.DateUtil; -import org.apache.poi.ss.usermodel.FillPatternType; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.xssf.usermodel.DefaultIndexedColorMap; -import org.apache.poi.xssf.usermodel.XSSFCell; -import org.apache.poi.xssf.usermodel.XSSFCellStyle; -import org.apache.poi.xssf.usermodel.XSSFColor; -import org.apache.poi.xssf.usermodel.XSSFDataFormat; -import org.apache.poi.xssf.usermodel.XSSFFont; -import org.apache.poi.xssf.usermodel.XSSFRichTextString; -import org.apache.poi.xssf.usermodel.XSSFRow; -import org.apache.poi.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.springframework.web.multipart.MultipartFile; - -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.parser.Feature; - -import com.mgm.mcrm.common.constants.SysCommon; -import com.mgm.mcrm.common.dtos.excel_model.ColumnDefine; -import com.mgm.mcrm.common.dtos.excel_model.ColumnGroupInfo; -import com.mgm.mcrm.common.dtos.excel_model.DataBlock; -import com.mgm.mcrm.common.dtos.excel_model.ExportDefine; -import com.mgm.mcrm.common.dtos.excel_model.GroupItem; -import com.mgm.mcrm.common.dtos.excel_model.ImportDefine; -import com.mgm.mcrm.common.dtos.excel_model.RowFieldInfo; -import com.mgm.mcrm.common.dtos.excel_model.SheetDefine; -import com.mgm.mcrm.common.dtos.system.ResFileResult; public class ExcelUtils { diff --git a/src/main/java/com/mgm/mcrm/common/utils/HttpUtil.java b/src/main/java/com/mgm/mcrm/common/utils/HttpUtil.java index 6f71b84..b67a8a8 100644 --- a/src/main/java/com/mgm/mcrm/common/utils/HttpUtil.java +++ b/src/main/java/com/mgm/mcrm/common/utils/HttpUtil.java @@ -1,19 +1,9 @@ package com.mgm.mcrm.common.utils; -import java.io.BufferedReader; -import java.io.IOException; -import java.nio.charset.Charset; -import java.security.cert.X509Certificate; -import java.util.List; -import java.util.Map; - -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; -import java.security.cert.CertificateException; +import com.mgm.mcrm.common.constants.SysCommon; +import com.mgm.mcrm.common.dtos.http_util.HttpRequestDefine; +import com.mgm.mcrm.common.dtos.http_util.HttpResponseResult; import jakarta.servlet.http.HttpServletRequest; - -import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Strings; import org.apache.hc.client5.http.classic.methods.HttpDelete; import org.apache.hc.client5.http.classic.methods.HttpGet; @@ -43,11 +33,16 @@ import org.apache.hc.core5.ssl.SSLContextBuilder; import org.apache.hc.core5.util.Timeout; import org.springframework.web.multipart.MultipartFile; - - -import com.mgm.mcrm.common.constants.SysCommon; -import com.mgm.mcrm.common.dtos.http_util.HttpRequestDefine; -import com.mgm.mcrm.common.dtos.http_util.HttpResponseResult; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; +import java.io.BufferedReader; +import java.io.IOException; +import java.nio.charset.Charset; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.List; +import java.util.Map; public class HttpUtil { diff --git a/src/main/java/com/mgm/mcrm/common/utils/LogUtil.java b/src/main/java/com/mgm/mcrm/common/utils/LogUtil.java index 0e9f733..4c6147f 100644 --- a/src/main/java/com/mgm/mcrm/common/utils/LogUtil.java +++ b/src/main/java/com/mgm/mcrm/common/utils/LogUtil.java @@ -1,13 +1,12 @@ package com.mgm.mcrm.common.utils; +import com.alibaba.fastjson.JSONObject; +import com.mgm.mcrm.common.constants.SysCommon; import com.mgm.mcrm.common.dtos.BaseApiResponse; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.alibaba.fastjson.JSONObject; -import com.mgm.mcrm.common.constants.SysCommon; - public class LogUtil { private static String loggerName = LogUtil.class.getName(); private static Logger logger = LoggerFactory.getLogger(loggerName); diff --git a/src/main/java/com/mgm/mcrm/common/utils/MailConfig.java b/src/main/java/com/mgm/mcrm/common/utils/MailConfig.java index 380b272..6750922 100644 --- a/src/main/java/com/mgm/mcrm/common/utils/MailConfig.java +++ b/src/main/java/com/mgm/mcrm/common/utils/MailConfig.java @@ -1,19 +1,6 @@ package com.mgm.mcrm.common.utils; -import java.io.File; -import java.util.List; -import java.util.Map; - -import jakarta.annotation.Resource; -import jakarta.mail.MessagingException; -import jakarta.mail.internet.MimeMessage; - -import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; -import org.springframework.core.io.FileSystemResource; -import org.springframework.mail.SimpleMailMessage; -import org.springframework.mail.javamail.JavaMailSenderImpl; -import org.springframework.mail.javamail.MimeMessageHelper; @Configuration public class MailConfig { diff --git a/src/main/java/com/mgm/mcrm/common/utils/MessageReceiverListenerImpl.java b/src/main/java/com/mgm/mcrm/common/utils/MessageReceiverListenerImpl.java index 2091dfe..cd3bba3 100644 --- a/src/main/java/com/mgm/mcrm/common/utils/MessageReceiverListenerImpl.java +++ b/src/main/java/com/mgm/mcrm/common/utils/MessageReceiverListenerImpl.java @@ -1,10 +1,6 @@ package com.mgm.mcrm.common.utils; -import org.jsmpp.bean.AlertNotification; -import org.jsmpp.bean.DataSm; -import org.jsmpp.bean.DeliverSm; -import org.jsmpp.bean.DeliveryReceipt; -import org.jsmpp.bean.MessageType; +import org.jsmpp.bean.*; import org.jsmpp.extra.ProcessRequestException; import org.jsmpp.session.DataSmResult; import org.jsmpp.session.MessageReceiverListener; diff --git a/src/main/java/com/mgm/mcrm/common/utils/NetworkUtil.java b/src/main/java/com/mgm/mcrm/common/utils/NetworkUtil.java index 240a994..ec533f1 100644 --- a/src/main/java/com/mgm/mcrm/common/utils/NetworkUtil.java +++ b/src/main/java/com/mgm/mcrm/common/utils/NetworkUtil.java @@ -1,6 +1,15 @@ package com.mgm.mcrm.common.utils; -import java.net.*; +import com.mgm.mcrm.common.constants.SysCommon; +import jakarta.servlet.http.HttpServletRequest; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.text.StringEscapeUtils; +import org.springframework.web.util.UriUtils; + +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.net.SocketException; +import java.net.URI; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; @@ -9,12 +18,6 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import jakarta.servlet.http.HttpServletRequest; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.text.StringEscapeUtils; -import org.springframework.web.util.UriUtils; -import com.mgm.mcrm.common.constants.SysCommon; - public class NetworkUtil { private static List interalIpPatterns = new ArrayList(); diff --git a/src/main/java/com/mgm/mcrm/common/utils/PDFUtil.java b/src/main/java/com/mgm/mcrm/common/utils/PDFUtil.java index 6ef5a3d..17554e8 100644 --- a/src/main/java/com/mgm/mcrm/common/utils/PDFUtil.java +++ b/src/main/java/com/mgm/mcrm/common/utils/PDFUtil.java @@ -1,12 +1,12 @@ package com.mgm.mcrm.common.utils; +import com.mgm.mcrm.common.constants.SysCommon; +import org.apache.commons.io.IOUtils; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import org.apache.commons.io.IOUtils; - -import com.mgm.mcrm.common.constants.SysCommon; /** * Converting html file to Pdf file With parallel Output and error stream for diff --git a/src/main/java/com/mgm/mcrm/common/utils/SOAPUtil.java b/src/main/java/com/mgm/mcrm/common/utils/SOAPUtil.java index 631be70..e5fc23a 100644 --- a/src/main/java/com/mgm/mcrm/common/utils/SOAPUtil.java +++ b/src/main/java/com/mgm/mcrm/common/utils/SOAPUtil.java @@ -1,44 +1,24 @@ package com.mgm.mcrm.common.utils; -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.StringReader; -import java.io.StringWriter; -import java.net.*; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; -import java.util.Iterator; -import java.util.List; -import org.apache.commons.lang3.StringUtils; - -import jakarta.xml.soap.SOAPEnvelope; -import jakarta.xml.soap.SOAPException; -import jakarta.xml.soap.SOAPMessage; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.NodeList; import com.mgm.mcrm.common.constants.SysCommon; - -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSession; -import javax.net.ssl.SSLSocketFactory; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; -import jakarta.xml.soap.MessageFactory; -import jakarta.xml.soap.Node; -import jakarta.xml.soap.SOAPBody; -import jakarta.xml.soap.SOAPElement; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.Marshaller; import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.soap.*; +import org.apache.commons.lang3.StringUtils; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.NodeList; + +import javax.net.ssl.*; import javax.xml.namespace.QName; +import java.io.*; +import java.net.HttpURLConnection; +import java.net.URL; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Iterator; +import java.util.List; public class SOAPUtil { diff --git a/src/main/java/com/mgm/mcrm/common/utils/SendEmail.java b/src/main/java/com/mgm/mcrm/common/utils/SendEmail.java index eda4cdf..8c20b89 100644 --- a/src/main/java/com/mgm/mcrm/common/utils/SendEmail.java +++ b/src/main/java/com/mgm/mcrm/common/utils/SendEmail.java @@ -1,24 +1,22 @@ package com.mgm.mcrm.common.utils; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Properties; - +import com.alibaba.fastjson.JSONObject; +import com.mgm.mcrm.booking.models.Bookings; import com.mgm.mcrm.booking.models.BookingsView; +import com.mgm.mcrm.common.constants.SysCommon; +import com.mgm.mcrm.common.dtos.EumnApprovalStatus; +import com.mgm.mcrm.notification.models.CfgEmailTemplate; +import com.mgm.mcrm.notification.models.Email; import jakarta.mail.Session; import jakarta.mail.internet.MimeMessage; - import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Strings; import org.springframework.mail.javamail.JavaMailSenderImpl; import org.springframework.mail.javamail.MimeMessageHelper; -import com.alibaba.fastjson.JSONObject; -import com.mgm.mcrm.common.constants.SysCommon; -import com.mgm.mcrm.booking.models.Bookings; -import com.mgm.mcrm.notification.models.CfgEmailTemplate; -import com.mgm.mcrm.notification.models.Email; -import com.mgm.mcrm.common.dtos.EumnApprovalStatus; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Properties; public class SendEmail { diff --git a/src/main/java/com/mgm/mcrm/common/utils/mockup/AjaxResultMockup.java b/src/main/java/com/mgm/mcrm/common/utils/mockup/AjaxResultMockup.java index 15d87ac..9bb6e6b 100644 --- a/src/main/java/com/mgm/mcrm/common/utils/mockup/AjaxResultMockup.java +++ b/src/main/java/com/mgm/mcrm/common/utils/mockup/AjaxResultMockup.java @@ -1,18 +1,15 @@ package com.mgm.mcrm.common.utils.mockup; -import java.util.List; - -import com.mgm.mcrm.common.dtos.BaseApiResponse; -import org.apache.commons.lang3.StringUtils; - -import com.alibaba.fastjson.parser.Feature; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; - +import com.alibaba.fastjson.parser.Feature; import com.mgm.mcrm.common.constants.SysCommon; +import com.mgm.mcrm.common.dtos.BaseApiResponse; import org.apache.commons.lang3.Strings; import org.apache.poi.ss.formula.functions.T; +import java.util.List; + public class AjaxResultMockup { diff --git a/src/main/java/com/mgm/mcrm/common/utils/mockup/HttpUtilMockup.java b/src/main/java/com/mgm/mcrm/common/utils/mockup/HttpUtilMockup.java index e6b790c..78211d1 100644 --- a/src/main/java/com/mgm/mcrm/common/utils/mockup/HttpUtilMockup.java +++ b/src/main/java/com/mgm/mcrm/common/utils/mockup/HttpUtilMockup.java @@ -1,19 +1,18 @@ package com.mgm.mcrm.common.utils.mockup; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.mgm.mcrm.common.constants.SysCommon; +import com.mgm.mcrm.common.dtos.http_util.HttpRequestDefine; +import com.mgm.mcrm.common.dtos.http_util.HttpResponseResult; +import com.mgm.mcrm.common.utils.LogUtil; + import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; - -import com.mgm.mcrm.common.constants.SysCommon; -import com.mgm.mcrm.common.dtos.http_util.HttpRequestDefine; -import com.mgm.mcrm.common.dtos.http_util.HttpResponseResult; -import com.mgm.mcrm.common.utils.LogUtil; - public class HttpUtilMockup { private static JSONArray mockupConfig=null; private static JSONArray getMockupConfig() { diff --git a/src/main/java/com/mgm/mcrm/logging/controllers/SysLogAppController.java b/src/main/java/com/mgm/mcrm/logging/controllers/SysLogAppController.java index 92f7b15..eadd001 100644 --- a/src/main/java/com/mgm/mcrm/logging/controllers/SysLogAppController.java +++ b/src/main/java/com/mgm/mcrm/logging/controllers/SysLogAppController.java @@ -1,24 +1,22 @@ package com.mgm.mcrm.logging.controllers; -import java.util.Date; import com.mgm.mcrm.authorization.dtos.LoginUserInfo; import com.mgm.mcrm.authorization.utils.JwtTokenUtil; -import org.apache.commons.lang3.StringUtils; -import org.springframework.web.util.HtmlUtils; - import com.mgm.mcrm.common.dtos.BaseApiResponse; +import com.mgm.mcrm.common.utils.DateTimeUtil; +import com.mgm.mcrm.common.utils.NetworkUtil; import com.mgm.mcrm.logging.dtos.AppLogDto; +import com.mgm.mcrm.logging.models.SysLogApp; import com.mgm.mcrm.logging.services.SysLogAppService; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; - +import org.apache.commons.lang3.StringUtils; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import org.springframework.web.util.HtmlUtils; -import com.mgm.mcrm.logging.models.SysLogApp; -import com.mgm.mcrm.common.utils.DateTimeUtil; -import com.mgm.mcrm.common.utils.NetworkUtil; +import java.util.Date; @RestController diff --git a/src/main/java/com/mgm/mcrm/logging/controllers/SysLogConfirmController.java b/src/main/java/com/mgm/mcrm/logging/controllers/SysLogConfirmController.java index 137446a..df6af45 100644 --- a/src/main/java/com/mgm/mcrm/logging/controllers/SysLogConfirmController.java +++ b/src/main/java/com/mgm/mcrm/logging/controllers/SysLogConfirmController.java @@ -1,22 +1,15 @@ package com.mgm.mcrm.logging.controllers; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import com.mgm.mcrm.booking.models.BookingsView; import com.mgm.mcrm.common.dtos.BaseApiResponse; import com.mgm.mcrm.logging.dtos.MobileConfirmLogRequest; import com.mgm.mcrm.logging.models.SysLogMobileConfirm; +import com.mgm.mcrm.logging.services.SysLogConfirmService; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; - import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import com.mgm.mcrm.logging.services.SysLogConfirmService; - @RestController @CrossOrigin(origins = "*") diff --git a/src/main/java/com/mgm/mcrm/logging/models/SysLogApp.java b/src/main/java/com/mgm/mcrm/logging/models/SysLogApp.java index a2c251d..d0e638f 100644 --- a/src/main/java/com/mgm/mcrm/logging/models/SysLogApp.java +++ b/src/main/java/com/mgm/mcrm/logging/models/SysLogApp.java @@ -1,15 +1,10 @@ package com.mgm.mcrm.logging.models; +import jakarta.persistence.*; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - @Entity @Table(name="sys_log_app") public class SysLogApp implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/logging/models/SysLogBooking.java b/src/main/java/com/mgm/mcrm/logging/models/SysLogBooking.java index 6f71335..8f15a52 100644 --- a/src/main/java/com/mgm/mcrm/logging/models/SysLogBooking.java +++ b/src/main/java/com/mgm/mcrm/logging/models/SysLogBooking.java @@ -1,15 +1,10 @@ package com.mgm.mcrm.logging.models; +import jakarta.persistence.*; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - @Entity @Table(name="sys_log_booking") public class SysLogBooking implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/logging/models/SysLogETA.java b/src/main/java/com/mgm/mcrm/logging/models/SysLogETA.java index a40723e..38be5be 100644 --- a/src/main/java/com/mgm/mcrm/logging/models/SysLogETA.java +++ b/src/main/java/com/mgm/mcrm/logging/models/SysLogETA.java @@ -1,6 +1,7 @@ package com.mgm.mcrm.logging.models; import jakarta.persistence.*; + import java.util.Date; @Entity diff --git a/src/main/java/com/mgm/mcrm/logging/models/SysLogLogin.java b/src/main/java/com/mgm/mcrm/logging/models/SysLogLogin.java index d049dd3..b6e5e4f 100644 --- a/src/main/java/com/mgm/mcrm/logging/models/SysLogLogin.java +++ b/src/main/java/com/mgm/mcrm/logging/models/SysLogLogin.java @@ -1,15 +1,10 @@ package com.mgm.mcrm.logging.models; +import jakarta.persistence.*; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - @Entity @Table(name="sys_log_login") public class SysLogLogin implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/logging/models/SysLogLoginIp.java b/src/main/java/com/mgm/mcrm/logging/models/SysLogLoginIp.java index 10c1158..99f793c 100644 --- a/src/main/java/com/mgm/mcrm/logging/models/SysLogLoginIp.java +++ b/src/main/java/com/mgm/mcrm/logging/models/SysLogLoginIp.java @@ -1,6 +1,7 @@ package com.mgm.mcrm.logging.models; import jakarta.persistence.*; + import java.io.Serializable; import java.util.Date; import java.util.Objects; diff --git a/src/main/java/com/mgm/mcrm/logging/models/SysLogMobileConfirm.java b/src/main/java/com/mgm/mcrm/logging/models/SysLogMobileConfirm.java index 9b05613..b9e3ea0 100644 --- a/src/main/java/com/mgm/mcrm/logging/models/SysLogMobileConfirm.java +++ b/src/main/java/com/mgm/mcrm/logging/models/SysLogMobileConfirm.java @@ -1,15 +1,10 @@ package com.mgm.mcrm.logging.models; +import jakarta.persistence.*; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - @Entity @Table(name="sys_log_confirm") public class SysLogMobileConfirm implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/logging/models/SysLogOperation.java b/src/main/java/com/mgm/mcrm/logging/models/SysLogOperation.java index 7a6785c..db1e1cb 100644 --- a/src/main/java/com/mgm/mcrm/logging/models/SysLogOperation.java +++ b/src/main/java/com/mgm/mcrm/logging/models/SysLogOperation.java @@ -1,15 +1,10 @@ package com.mgm.mcrm.logging.models; +import jakarta.persistence.*; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - @Entity @Table(name="sys_log_operation") public class SysLogOperation implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/logging/repositories/SysLogAppDao.java b/src/main/java/com/mgm/mcrm/logging/repositories/SysLogAppDao.java index 8970de5..30da03c 100644 --- a/src/main/java/com/mgm/mcrm/logging/repositories/SysLogAppDao.java +++ b/src/main/java/com/mgm/mcrm/logging/repositories/SysLogAppDao.java @@ -1,7 +1,6 @@ package com.mgm.mcrm.logging.repositories; -import java.util.List; - +import com.mgm.mcrm.logging.models.SysLogApp; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; @@ -9,7 +8,7 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; -import com.mgm.mcrm.logging.models.SysLogApp; +import java.util.List; public interface SysLogAppDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/logging/repositories/SysLogBookingDao.java b/src/main/java/com/mgm/mcrm/logging/repositories/SysLogBookingDao.java index 86671eb..e9cfdc3 100644 --- a/src/main/java/com/mgm/mcrm/logging/repositories/SysLogBookingDao.java +++ b/src/main/java/com/mgm/mcrm/logging/repositories/SysLogBookingDao.java @@ -1,14 +1,13 @@ package com.mgm.mcrm.logging.repositories; -import java.util.List; - +import com.mgm.mcrm.logging.models.SysLogBooking; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; -import com.mgm.mcrm.logging.models.SysLogBooking; +import java.util.List; diff --git a/src/main/java/com/mgm/mcrm/logging/repositories/SysLogConfirmDao.java b/src/main/java/com/mgm/mcrm/logging/repositories/SysLogConfirmDao.java index b41f4eb..202754b 100644 --- a/src/main/java/com/mgm/mcrm/logging/repositories/SysLogConfirmDao.java +++ b/src/main/java/com/mgm/mcrm/logging/repositories/SysLogConfirmDao.java @@ -1,14 +1,13 @@ package com.mgm.mcrm.logging.repositories; -import java.util.List; - +import com.mgm.mcrm.logging.models.SysLogMobileConfirm; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; -import com.mgm.mcrm.logging.models.SysLogMobileConfirm; +import java.util.List; public interface SysLogConfirmDao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/logging/repositories/SysLogETADao.java b/src/main/java/com/mgm/mcrm/logging/repositories/SysLogETADao.java index 17aa35b..767c7f7 100644 --- a/src/main/java/com/mgm/mcrm/logging/repositories/SysLogETADao.java +++ b/src/main/java/com/mgm/mcrm/logging/repositories/SysLogETADao.java @@ -1,9 +1,7 @@ package com.mgm.mcrm.logging.repositories; -import org.springframework.data.jpa.repository.JpaRepository; import com.mgm.mcrm.logging.models.SysLogETA; - -import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; public interface SysLogETADao extends JpaRepository { diff --git a/src/main/java/com/mgm/mcrm/logging/repositories/SysLogLoginDao.java b/src/main/java/com/mgm/mcrm/logging/repositories/SysLogLoginDao.java index e9b08d9..f12dbc2 100644 --- a/src/main/java/com/mgm/mcrm/logging/repositories/SysLogLoginDao.java +++ b/src/main/java/com/mgm/mcrm/logging/repositories/SysLogLoginDao.java @@ -1,17 +1,16 @@ package com.mgm.mcrm.logging.repositories; -import java.util.List; - +import com.mgm.mcrm.logging.models.SysLogLogin; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; -import com.mgm.mcrm.logging.models.SysLogLogin; +import java.util.List; -public interface SysLogLoginDao extends JpaRepository { +public interface SysLogLoginDao extends JpaRepository { SysLogLogin findById(long id); List findAll(Specification spec,Sort sort); List findAll(Specification spec); diff --git a/src/main/java/com/mgm/mcrm/logging/repositories/SysLogLoginIpDao.java b/src/main/java/com/mgm/mcrm/logging/repositories/SysLogLoginIpDao.java index c3237ea..9ac4101 100644 --- a/src/main/java/com/mgm/mcrm/logging/repositories/SysLogLoginIpDao.java +++ b/src/main/java/com/mgm/mcrm/logging/repositories/SysLogLoginIpDao.java @@ -1,9 +1,9 @@ package com.mgm.mcrm.logging.repositories; +import com.mgm.mcrm.logging.models.SysLogLoginIp; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import com.mgm.mcrm.logging.models.SysLogLoginIp; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/mgm/mcrm/logging/repositories/SysLogOperationDao.java b/src/main/java/com/mgm/mcrm/logging/repositories/SysLogOperationDao.java index d8ab3ec..193eecd 100644 --- a/src/main/java/com/mgm/mcrm/logging/repositories/SysLogOperationDao.java +++ b/src/main/java/com/mgm/mcrm/logging/repositories/SysLogOperationDao.java @@ -1,17 +1,16 @@ package com.mgm.mcrm.logging.repositories; -import java.util.List; - +import com.mgm.mcrm.logging.models.SysLogOperation; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.repository.JpaRepository; -import com.mgm.mcrm.logging.models.SysLogOperation; +import java.util.List; -public interface SysLogOperationDao extends JpaRepository { +public interface SysLogOperationDao extends JpaRepository { SysLogOperation findById(long id); List findAll(Specification spec,Sort sort); List findAll(Specification spec); diff --git a/src/main/java/com/mgm/mcrm/logging/services/SysLogAppService.java b/src/main/java/com/mgm/mcrm/logging/services/SysLogAppService.java index 4d77e37..f0a5993 100644 --- a/src/main/java/com/mgm/mcrm/logging/services/SysLogAppService.java +++ b/src/main/java/com/mgm/mcrm/logging/services/SysLogAppService.java @@ -1,10 +1,9 @@ package com.mgm.mcrm.logging.services; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - import com.mgm.mcrm.logging.models.SysLogApp; import com.mgm.mcrm.logging.repositories.SysLogAppDao; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; @Service public class SysLogAppService { diff --git a/src/main/java/com/mgm/mcrm/logging/services/SysLogBookingService.java b/src/main/java/com/mgm/mcrm/logging/services/SysLogBookingService.java index 94b66da..e973e21 100644 --- a/src/main/java/com/mgm/mcrm/logging/services/SysLogBookingService.java +++ b/src/main/java/com/mgm/mcrm/logging/services/SysLogBookingService.java @@ -1,23 +1,21 @@ package com.mgm.mcrm.logging.services; +import com.mgm.mcrm.authorization.dtos.LoginUserInfo; +import com.mgm.mcrm.booking.models.Bookings; +import com.mgm.mcrm.common.constants.SysCommon; +import com.mgm.mcrm.common.dtos.EumnApprovalStatus; +import com.mgm.mcrm.common.utils.NetworkUtil; +import com.mgm.mcrm.logging.models.SysLogBooking; +import com.mgm.mcrm.logging.repositories.SysLogBookingDao; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.Date; import java.util.List; -import com.mgm.mcrm.authorization.dtos.LoginUserInfo; -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletRequest; - -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; - -import com.mgm.mcrm.logging.models.SysLogBooking; -import com.mgm.mcrm.booking.models.Bookings; -import com.mgm.mcrm.common.dtos.EumnApprovalStatus; -import com.mgm.mcrm.common.utils.NetworkUtil; -import com.mgm.mcrm.common.constants.SysCommon; -import com.mgm.mcrm.logging.repositories.SysLogBookingDao; - @Service public class SysLogBookingService { diff --git a/src/main/java/com/mgm/mcrm/logging/services/SysLogConfirmService.java b/src/main/java/com/mgm/mcrm/logging/services/SysLogConfirmService.java index 92d3408..03197f1 100644 --- a/src/main/java/com/mgm/mcrm/logging/services/SysLogConfirmService.java +++ b/src/main/java/com/mgm/mcrm/logging/services/SysLogConfirmService.java @@ -1,16 +1,14 @@ package com.mgm.mcrm.logging.services; -import java.util.Date; -import java.util.Map; - import com.mgm.mcrm.common.dtos.BaseApiResponse; import com.mgm.mcrm.logging.dtos.MobileConfirmLogRequest; +import com.mgm.mcrm.logging.models.SysLogMobileConfirm; +import com.mgm.mcrm.logging.repositories.SysLogConfirmDao; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; -import com.mgm.mcrm.logging.models.SysLogMobileConfirm; -import com.mgm.mcrm.logging.repositories.SysLogConfirmDao; +import java.util.Date; @Service public class SysLogConfirmService { diff --git a/src/main/java/com/mgm/mcrm/logging/services/SysLogDeviceTokenService.java b/src/main/java/com/mgm/mcrm/logging/services/SysLogDeviceTokenService.java index 491c4ed..6b76001 100644 --- a/src/main/java/com/mgm/mcrm/logging/services/SysLogDeviceTokenService.java +++ b/src/main/java/com/mgm/mcrm/logging/services/SysLogDeviceTokenService.java @@ -8,7 +8,6 @@ import com.mgm.mcrm.logging.models.SysLogDeviceToken; import com.mgm.mcrm.logging.repositories.SysLogDeviceTokenDao; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.Date; diff --git a/src/main/java/com/mgm/mcrm/logging/services/SysLogETAService.java b/src/main/java/com/mgm/mcrm/logging/services/SysLogETAService.java index ec66b53..8ddad76 100644 --- a/src/main/java/com/mgm/mcrm/logging/services/SysLogETAService.java +++ b/src/main/java/com/mgm/mcrm/logging/services/SysLogETAService.java @@ -1,10 +1,9 @@ package com.mgm.mcrm.logging.services; import com.mgm.mcrm.logging.models.SysLogETA; -import org.springframework.stereotype.Service; import com.mgm.mcrm.logging.repositories.SysLogETADao; - import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; @Service public class SysLogETAService { diff --git a/src/main/java/com/mgm/mcrm/logging/services/SysLogLoginIpService.java b/src/main/java/com/mgm/mcrm/logging/services/SysLogLoginIpService.java index baf1496..e4b814e 100644 --- a/src/main/java/com/mgm/mcrm/logging/services/SysLogLoginIpService.java +++ b/src/main/java/com/mgm/mcrm/logging/services/SysLogLoginIpService.java @@ -1,13 +1,12 @@ package com.mgm.mcrm.logging.services; import com.mgm.mcrm.logging.models.SysLogLoginIp; -import org.springframework.stereotype.Service; import com.mgm.mcrm.logging.repositories.SysLogLoginIpDao; - import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; + import java.util.Calendar; import java.util.Date; -import java.util.List; @Service public class SysLogLoginIpService { diff --git a/src/main/java/com/mgm/mcrm/logging/services/SysLogLoginService.java b/src/main/java/com/mgm/mcrm/logging/services/SysLogLoginService.java index fb28646..383b3c2 100644 --- a/src/main/java/com/mgm/mcrm/logging/services/SysLogLoginService.java +++ b/src/main/java/com/mgm/mcrm/logging/services/SysLogLoginService.java @@ -1,10 +1,9 @@ package com.mgm.mcrm.logging.services; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - import com.mgm.mcrm.logging.models.SysLogLogin; import com.mgm.mcrm.logging.repositories.SysLogLoginDao; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; @Service public class SysLogLoginService { diff --git a/src/main/java/com/mgm/mcrm/logging/services/SysLogOperationService.java b/src/main/java/com/mgm/mcrm/logging/services/SysLogOperationService.java index 74ea020..801e97c 100644 --- a/src/main/java/com/mgm/mcrm/logging/services/SysLogOperationService.java +++ b/src/main/java/com/mgm/mcrm/logging/services/SysLogOperationService.java @@ -1,10 +1,9 @@ package com.mgm.mcrm.logging.services; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - import com.mgm.mcrm.logging.models.SysLogOperation; import com.mgm.mcrm.logging.repositories.SysLogOperationDao; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; @Service public class SysLogOperationService { diff --git a/src/main/java/com/mgm/mcrm/notification/controllers/EmailTemplateController.java b/src/main/java/com/mgm/mcrm/notification/controllers/EmailTemplateController.java index 669c729..8f3fa1f 100644 --- a/src/main/java/com/mgm/mcrm/notification/controllers/EmailTemplateController.java +++ b/src/main/java/com/mgm/mcrm/notification/controllers/EmailTemplateController.java @@ -1,18 +1,16 @@ package com.mgm.mcrm.notification.controllers; -import java.util.List; - import com.mgm.mcrm.common.dtos.BaseApiResponse; import com.mgm.mcrm.notification.dtos.request.GenerateBookingEmailRequest; +import com.mgm.mcrm.notification.models.CfgEmailTemplate; import com.mgm.mcrm.notification.services.EmailTemplateService; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; - import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import com.mgm.mcrm.notification.models.CfgEmailTemplate; +import java.util.List; @RestController diff --git a/src/main/java/com/mgm/mcrm/notification/models/CfgEmailTemplate.java b/src/main/java/com/mgm/mcrm/notification/models/CfgEmailTemplate.java index 6e933b3..1d016ef 100644 --- a/src/main/java/com/mgm/mcrm/notification/models/CfgEmailTemplate.java +++ b/src/main/java/com/mgm/mcrm/notification/models/CfgEmailTemplate.java @@ -1,16 +1,10 @@ package com.mgm.mcrm.notification.models; +import jakarta.persistence.*; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import jakarta.persistence.Transient; - @Entity @Table(name="cfg_email_template") public class CfgEmailTemplate implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/notification/models/Email.java b/src/main/java/com/mgm/mcrm/notification/models/Email.java index d95dc90..f1d3066 100644 --- a/src/main/java/com/mgm/mcrm/notification/models/Email.java +++ b/src/main/java/com/mgm/mcrm/notification/models/Email.java @@ -1,15 +1,10 @@ package com.mgm.mcrm.notification.models; +import jakarta.persistence.*; + import java.io.Serializable; import java.util.Date; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; - @Entity @Table(name="email") public class Email implements Serializable { diff --git a/src/main/java/com/mgm/mcrm/notification/repositories/EmailDao.java b/src/main/java/com/mgm/mcrm/notification/repositories/EmailDao.java index 719d74f..7a78413 100644 --- a/src/main/java/com/mgm/mcrm/notification/repositories/EmailDao.java +++ b/src/main/java/com/mgm/mcrm/notification/repositories/EmailDao.java @@ -1,11 +1,10 @@ package com.mgm.mcrm.notification.repositories; +import com.mgm.mcrm.notification.models.Email; import org.springframework.data.jpa.repository.JpaRepository; -import com.mgm.mcrm.notification.models.Email; - -public interface EmailDao extends JpaRepository { +public interface EmailDao extends JpaRepository { Email findById(long id); } diff --git a/src/main/java/com/mgm/mcrm/notification/repositories/EmailTemplateDao.java b/src/main/java/com/mgm/mcrm/notification/repositories/EmailTemplateDao.java index f1df4e7..d18c1d8 100644 --- a/src/main/java/com/mgm/mcrm/notification/repositories/EmailTemplateDao.java +++ b/src/main/java/com/mgm/mcrm/notification/repositories/EmailTemplateDao.java @@ -1,14 +1,13 @@ package com.mgm.mcrm.notification.repositories; -import java.util.List; - +import com.mgm.mcrm.notification.models.CfgEmailTemplate; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; -import com.mgm.mcrm.notification.models.CfgEmailTemplate; +import java.util.List; -public interface EmailTemplateDao extends JpaRepository { +public interface EmailTemplateDao extends JpaRepository { @Query(value="select * from cfg_email_template where property_id = ?1 and type = ?2",nativeQuery=true) List getByPropertyIdAndType(Long propertyId,String type); } diff --git a/src/main/java/com/mgm/mcrm/notification/services/ApnNotificationService.java b/src/main/java/com/mgm/mcrm/notification/services/ApnNotificationService.java index 63d9043..d760e86 100644 --- a/src/main/java/com/mgm/mcrm/notification/services/ApnNotificationService.java +++ b/src/main/java/com/mgm/mcrm/notification/services/ApnNotificationService.java @@ -6,8 +6,8 @@ import com.eatthepath.pushy.apns.util.SimpleApnsPayloadBuilder; import com.eatthepath.pushy.apns.util.SimpleApnsPushNotification; import com.eatthepath.pushy.apns.util.concurrent.PushNotificationFuture; import com.mgm.mcrm.common.dtos.BaseApiResponse; -import com.mgm.mcrm.notification.repositories.SysLogNotificationRepository; import com.mgm.mcrm.notification.models.SysLogNotification; +import com.mgm.mcrm.notification.repositories.SysLogNotificationRepository; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/src/main/java/com/mgm/mcrm/notification/services/EmailTemplateService.java b/src/main/java/com/mgm/mcrm/notification/services/EmailTemplateService.java index 2d9fd6f..b237596 100644 --- a/src/main/java/com/mgm/mcrm/notification/services/EmailTemplateService.java +++ b/src/main/java/com/mgm/mcrm/notification/services/EmailTemplateService.java @@ -1,36 +1,33 @@ package com.mgm.mcrm.notification.services; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.mgm.mcrm.authorization.services.MgmUserService; +import com.mgm.mcrm.basesetting.room.repositories.OtherRoomStatusDao; +import com.mgm.mcrm.booking.models.Bookings; +import com.mgm.mcrm.booking.models.BookingsView; +import com.mgm.mcrm.booking.repositories.BookingDao; +import com.mgm.mcrm.booking.repositories.BookingViewDao; +import com.mgm.mcrm.common.dtos.BaseApiResponse; +import com.mgm.mcrm.common.dtos.mgm_api.UserInfoApiRecord; +import com.mgm.mcrm.common.utils.DateTimeUtil; +import com.mgm.mcrm.common.utils.SendEmail; +import com.mgm.mcrm.logging.services.SysLogBookingService; +import com.mgm.mcrm.notification.models.CfgEmailTemplate; +import com.mgm.mcrm.notification.models.Email; +import com.mgm.mcrm.notification.repositories.EmailDao; +import com.mgm.mcrm.notification.repositories.EmailTemplateDao; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Strings; +import org.springframework.stereotype.Service; + import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; -import com.mgm.mcrm.booking.models.BookingsView; -import com.mgm.mcrm.common.dtos.BaseApiResponse; -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletRequest; - -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.Strings; -import org.springframework.stereotype.Service; - -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; - -import com.mgm.mcrm.booking.repositories.BookingDao; -import com.mgm.mcrm.booking.repositories.BookingViewDao; -import com.mgm.mcrm.notification.repositories.EmailDao; -import com.mgm.mcrm.notification.repositories.EmailTemplateDao; -import com.mgm.mcrm.basesetting.room.repositories.OtherRoomStatusDao; -import com.mgm.mcrm.booking.models.Bookings; -import com.mgm.mcrm.notification.models.CfgEmailTemplate; -import com.mgm.mcrm.notification.models.Email; -import com.mgm.mcrm.common.dtos.mgm_api.UserInfoApiRecord; -import com.mgm.mcrm.authorization.services.MgmUserService; -import com.mgm.mcrm.logging.services.SysLogBookingService; -import com.mgm.mcrm.common.utils.DateTimeUtil; -import com.mgm.mcrm.common.utils.SendEmail; - @Service public class EmailTemplateService { diff --git a/src/main/java/com/mgm/mcrm/player/controllers/PlayerController.java b/src/main/java/com/mgm/mcrm/player/controllers/PlayerController.java index cc82886..4c9ded0 100644 --- a/src/main/java/com/mgm/mcrm/player/controllers/PlayerController.java +++ b/src/main/java/com/mgm/mcrm/player/controllers/PlayerController.java @@ -1,31 +1,29 @@ package com.mgm.mcrm.player.controllers; -import java.util.List; -import java.util.Map; - import com.auth0.jwt.JWT; +import com.mgm.mcrm.appsetting.services.SysSettingService; import com.mgm.mcrm.authorization.dtos.LoginUserInfo; import com.mgm.mcrm.booking.dtos.search.CheckSecondTPDRequest; import com.mgm.mcrm.booking.dtos.search.CheckTPDRequest; import com.mgm.mcrm.booking.dtos.search.DateRange; import com.mgm.mcrm.common.constants.SysCommon; import com.mgm.mcrm.common.dtos.BaseApiResponse; +import com.mgm.mcrm.common.dtos.mgm_api.PlayerProfileEntry; import com.mgm.mcrm.common.dtos.mgm_api.PlayerTPDApiResult; import com.mgm.mcrm.player.dtos.request.WebCheckPlayerTPDRequest; import com.mgm.mcrm.player.dtos.request.WebPlayerLookupRequest; +import com.mgm.mcrm.player.services.PlayerService; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; - import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Strings; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import com.mgm.mcrm.common.dtos.mgm_api.PlayerProfileEntry; -import com.mgm.mcrm.player.services.PlayerService; -import com.mgm.mcrm.appsetting.services.SysSettingService; +import java.util.List; +import java.util.Map; @RestController @CrossOrigin(origins = "*") diff --git a/src/main/java/com/mgm/mcrm/player/controllers/TodoController.java b/src/main/java/com/mgm/mcrm/player/controllers/TodoController.java index b909290..b6810cc 100644 --- a/src/main/java/com/mgm/mcrm/player/controllers/TodoController.java +++ b/src/main/java/com/mgm/mcrm/player/controllers/TodoController.java @@ -1,9 +1,5 @@ package com.mgm.mcrm.player.controllers; -import java.sql.Date; -import java.util.ArrayList; -import java.util.List; - import com.mgm.mcrm.authorization.dtos.LoginUserInfo; import com.mgm.mcrm.authorization.models.SysRouterPermission; import com.mgm.mcrm.authorization.services.SysGroupPermissionService; @@ -11,26 +7,28 @@ import com.mgm.mcrm.booking.dtos.BookingDto; import com.mgm.mcrm.booking.models.Bookings; import com.mgm.mcrm.common.constants.SysCommon; import com.mgm.mcrm.common.dtos.BaseApiResponse; +import com.mgm.mcrm.common.dtos.mgm_api.PlayerProfileEntry; import com.mgm.mcrm.common.dtos.mgm_api.TodoDashboardResult; import com.mgm.mcrm.common.dtos.mgm_api.TodoDateListResult; import com.mgm.mcrm.common.dtos.mgm_api.TodoDetailResult; import com.mgm.mcrm.logging.models.SysLogETA; +import com.mgm.mcrm.logging.services.SysLogETAService; import com.mgm.mcrm.player.dtos.request.*; import com.mgm.mcrm.player.dtos.response.GetDashboardResponse; import com.mgm.mcrm.player.dtos.response.GetTodoDetailResponse; +import com.mgm.mcrm.player.services.PlayerService; +import com.mgm.mcrm.player.services.TodoService; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; - import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Strings; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import com.mgm.mcrm.common.dtos.mgm_api.PlayerProfileEntry; -import com.mgm.mcrm.player.services.PlayerService; -import com.mgm.mcrm.player.services.TodoService; -import com.mgm.mcrm.logging.services.SysLogETAService; +import java.sql.Date; +import java.util.ArrayList; +import java.util.List; @RestController @CrossOrigin(origins = "*") diff --git a/src/main/java/com/mgm/mcrm/player/dtos/response/ReservationResultResponse.java b/src/main/java/com/mgm/mcrm/player/dtos/response/ReservationResultResponse.java index 509bb23..d81459c 100644 --- a/src/main/java/com/mgm/mcrm/player/dtos/response/ReservationResultResponse.java +++ b/src/main/java/com/mgm/mcrm/player/dtos/response/ReservationResultResponse.java @@ -1,7 +1,5 @@ package com.mgm.mcrm.player.dtos.response; -import com.alibaba.fastjson.annotation.JSONField; -import com.mgm.mcrm.basesetting.property.dtos.response.DayLightProfileResponse; import lombok.Data; /** diff --git a/src/main/java/com/mgm/mcrm/player/services/TodoService.java b/src/main/java/com/mgm/mcrm/player/services/TodoService.java index 62d55a5..a37a649 100644 --- a/src/main/java/com/mgm/mcrm/player/services/TodoService.java +++ b/src/main/java/com/mgm/mcrm/player/services/TodoService.java @@ -56,7 +56,9 @@ import org.apache.commons.lang3.Strings; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; +import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.TimeUnit; @@ -162,53 +164,84 @@ public class TodoService { TodoDetailResult resultObj = JSONObject.parseObject(httpResult.getResponseContent(), TodoDetailResult.class, Feature.SupportNonPublicField, Feature.IgnoreNotMatch); if (Strings.CI.equals(resultObj.getStatusCode(), "OK")) { - - // TODO daylight专用，后面要改 by Mauve - if (1 == 1) { - if (resultObj.getDescriptions() != null) { - for (TodoDetailDescription detailRecord : resultObj.getDescriptions()) { - if ("Room".equalsIgnoreCase(detailRecord.getItemRecordType())) { - String recordDesc = detailRecord.getItemRecordDescription(); - if (StringUtils.isNotBlank(recordDesc)) { - String confNum = null; - int index = recordDesc.indexOf("Conf#"); - if (index != -1) { - String sub = recordDesc.substring(index + 5); - int pipeIndex = sub.indexOf("|"); - if (pipeIndex != -1) { - confNum = sub.substring(0, pipeIndex).trim(); - } else { - confNum = sub.trim(); - } + if (resultObj.getDescriptions() != null) { + for (TodoDetailDescription detailRecord : resultObj.getDescriptions()) { + if ("Room".equalsIgnoreCase(detailRecord.getItemRecordType())) { + String recordDesc = detailRecord.getItemRecordDescription(); + if (StringUtils.isNotBlank(recordDesc)) { + String confNum = null; + int index = recordDesc.indexOf("Conf#"); + if (index != -1) { + String sub = recordDesc.substring(index + 5); + int pipeIndex = sub.indexOf("|"); + if (pipeIndex != -1) { + confNum = sub.substring(0, pipeIndex).trim(); + } else { + confNum = sub.trim(); } + } + + if (StringUtils.isNotBlank(confNum)) { + if ("Inhouse".equalsIgnoreCase(todoCategory) || "Arrival".equalsIgnoreCase(todoCategory)) { + List daylightProperties = propertyDao.findByCategory("DAYLIGHT"); + if (CollectionUtils.isNotEmpty(daylightProperties)) { + CfgProperties property = daylightProperties.get(0); + + if ("Inhouse".equalsIgnoreCase(todoCategory)) { + // Parse checkinDate from recordDesc (e.g., "Jun 25 – Jul 1 ...") + LocalDate ciDate = null; + try { + String ciDatePart = recordDesc.split("–")[0].trim(); + // Use the year from the 'date' parameter + int year = Integer.parseInt(date.substring(0, 4)); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MMM d yyyy", Locale.US); + ciDate = LocalDate.parse(ciDatePart + " " + year, formatter); + } catch (Exception e) { + LogUtil.warn(TodoService.class, "Parse checkinDate error: " + e.getMessage() + ", recordDesc: " + recordDesc); + } + + if (ciDate != null) { + LocalDate today = LocalDate.now(); + if (ciDate.isAfter(today)) { + // 当checkindate大于今天不用拿room number 和room ready + continue; + } - if (StringUtils.isNotBlank(confNum)) { - if ("Inhouse".equalsIgnoreCase(todoCategory) || "Arrival".equalsIgnoreCase(todoCategory)) { - List daylightProperties = propertyDao.findByCategory("DAYLIGHT"); - if (CollectionUtils.isNotEmpty(daylightProperties)) { - CfgProperties property = daylightProperties.get(0); - if ("Inhouse".equalsIgnoreCase(todoCategory)) { BaseApiResponse doorKeyResult = dlService.getReservationDoorKeyByConfirmationNumber(property.getDlPropertyId(), confNum); ReservationDoorKeyResponse doorKeyData = doorKeyResult.getData(); - boolean isRoomReady = doorKeyResult.isSuccess() - && doorKeyData != null - && StringUtils.isNotBlank(doorKeyData.getId()) - && !doorKeyData.isHasKey(); - if (isRoomReady) { - detailRecord.setItemRecordDescription(recordDesc.replace("Conf#" + confNum, "Conf#" + confNum + " [Rm Ready]")); - } - } else { - BaseApiResponse queueResult = - dlService.getReservationQueueByConfirmationNumber(property.getDlPropertyId(), confNum); - ReservationQueueResponse queueData = queueResult.getData(); - boolean isQueue = queueResult.isSuccess() - && queueData != null - && queueData.isQueue(); - if (isQueue) { - detailRecord.setItemRecordDescription(recordDesc.replace("Conf#" + confNum, "Conf#" + confNum + " [In Queue]")); + + if (doorKeyResult.isSuccess() && doorKeyData != null) { + String replaceStr = "Conf#" + confNum; + if (StringUtils.isNotBlank(doorKeyData.getRoomNumber())) { + detailRecord.setRoomNumber(doorKeyData.getRoomNumber()); + replaceStr += " [Rm #" + doorKeyData.getRoomNumber() + "]"; + } + + if (ciDate.isEqual(today)) { + // 当今天的时候要检查room ready + boolean isRoomReady = StringUtils.isNotBlank(doorKeyData.getId()) + && !doorKeyData.isHasKey(); + if (isRoomReady) { + replaceStr += " [Rm Ready]"; + } + } + + if (!replaceStr.equals("Conf#" + confNum)) { + detailRecord.setItemRecordDescription(recordDesc.replace("Conf#" + confNum, replaceStr)); + } } } + }else{ + BaseApiResponse queueResult = + dlService.getReservationQueueByConfirmationNumber(property.getDlPropertyId(), confNum); + ReservationQueueResponse queueData = queueResult.getData(); + boolean isQueue = queueResult.isSuccess() + && queueData != null + && queueData.isQueue(); + if (isQueue) { + detailRecord.setItemRecordDescription(recordDesc.replace("Conf#" + confNum, "Conf#" + confNum + " [In Queue]")); + } } } } @@ -217,7 +250,6 @@ public class TodoService { } } } - result.setSuccess(true); result.setReturnData(resultObj); } else { @@ -478,15 +510,58 @@ public class TodoService { List dateRecords = todoDateListRecord.getDateRecords(); for (TodoListRecord record : dateRecords) { - String daylightConfirmationNo = record.getOperaConfirmationNo(); + List descriptions = record.getDescriptions(); + if (CollectionUtils.isEmpty(descriptions)) { + continue; + } try { - String[] split = daylightConfirmationNo.split(","); + for (String description : descriptions) { + if (StringUtils.isBlank(description)) { + continue; + } - for (String temp2 : split) { - String[] split1 = temp2.split(";"); + int confIndex = description.indexOf("Conf#"); + if (confIndex == -1) { + continue; + } - String confNum = split1[split1.length - 1]; + String confPart = description.substring(confIndex + 5); + int pipeIndex = confPart.indexOf("|"); + String confNum = (pipeIndex == -1 ? confPart : confPart.substring(0, pipeIndex)).trim(); + + if (StringUtils.isNotBlank(confNum)) { + if ("Inhouse".equalsIgnoreCase(category) || "Arrival".equalsIgnoreCase(category)) { + List daylightProperties = propertyDao.findByCategory("DAYLIGHT"); + if (CollectionUtils.isNotEmpty(daylightProperties)) { + CfgProperties property = daylightProperties.get(0); + if ("Inhouse".equalsIgnoreCase(category)) { + BaseApiResponse doorKeyResult = + dlService.getReservationDoorKeyByConfirmationNumber(property.getDlPropertyId(), confNum); + ReservationDoorKeyResponse doorKeyData = doorKeyResult.getData(); + boolean isRoomReady = doorKeyResult.isSuccess() + && doorKeyData != null + && StringUtils.isNotBlank(doorKeyData.getId()) + && !doorKeyData.isHasKey(); + if (isRoomReady) { + record.setRoomReady(true); + updateTodoRecordDescription(record, confNum, "[Rm Ready]"); + } + } else { + BaseApiResponse queueResult = + dlService.getReservationQueueByConfirmationNumber(property.getDlPropertyId(), confNum); + ReservationQueueResponse queueData = queueResult.getData(); + boolean isQueue = queueResult.isSuccess() + && queueData != null + && queueData.isQueue(); + if (isQueue) { + record.setIsQueue(true); + updateTodoRecordDescription(record, confNum, "[In Queue]"); + } + } + } + } + } List bookingByConfirmationNo = bookingService.getBookingByDaylightConf(confNum); @@ -498,7 +573,7 @@ public class TodoService { } } } catch (Exception e) { - log.warn("Failed to set ETA, operaConfirmationNo={}", daylightConfirmationNo, e); + log.warn("Failed to process todo descriptions={}", descriptions, e); } } } @@ -987,5 +1062,17 @@ public class TodoService { return isPass; } + private void updateTodoRecordDescription(TodoListRecord record, String confNum, String tag) { + List descriptions = record.getDescriptions(); + if (CollectionUtils.isNotEmpty(descriptions)) { + for (int i = 0; i < descriptions.size(); i++) { + String desc = descriptions.get(i); + if (StringUtils.isNotBlank(desc) && desc.contains("Conf#" + confNum)) { + descriptions.set(i, desc.replace("Conf#" + confNum, "Conf#" + confNum + " " + tag)); + } + } + } + } + } diff --git a/src/main/java/com/mgm/mcrm/roomcalendar/controllers/RoomCalendarController.java b/src/main/java/com/mgm/mcrm/roomcalendar/controllers/RoomCalendarController.java index 33df39c..d1f85ee 100644 --- a/src/main/java/com/mgm/mcrm/roomcalendar/controllers/RoomCalendarController.java +++ b/src/main/java/com/mgm/mcrm/roomcalendar/controllers/RoomCalendarController.java @@ -11,11 +11,7 @@ import com.mgm.mcrm.roomcalendar.services.RoomCalendarService; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/mgm/mcrm/roomcalendar/services/CalendarMockData.java b/src/main/java/com/mgm/mcrm/roomcalendar/services/CalendarMockData.java index df704e5..b2adb02 100644 --- a/src/main/java/com/mgm/mcrm/roomcalendar/services/CalendarMockData.java +++ b/src/main/java/com/mgm/mcrm/roomcalendar/services/CalendarMockData.java @@ -2,7 +2,10 @@ package com.mgm.mcrm.roomcalendar.services; import com.mgm.mcrm.appsetting.models.CfgSettings; import com.mgm.mcrm.roomcalendar.dtos.RoomCalendarQualification; -import com.mgm.mcrm.roomcalendar.dtos.response.*; +import com.mgm.mcrm.roomcalendar.dtos.response.GetPropertyRoomTypeListResponse; +import com.mgm.mcrm.roomcalendar.dtos.response.GetPropertyRoomTypeResponse; +import com.mgm.mcrm.roomcalendar.dtos.response.RoomType; + import java.time.LocalDate; import java.time.temporal.ChronoUnit; import java.util.*; diff --git a/src/main/java/com/mgm/mcrm/roomcalendar/services/RoomCalendarService.java b/src/main/java/com/mgm/mcrm/roomcalendar/services/RoomCalendarService.java index d8d9fbc..f5115ac 100644 --- a/src/main/java/com/mgm/mcrm/roomcalendar/services/RoomCalendarService.java +++ b/src/main/java/com/mgm/mcrm/roomcalendar/services/RoomCalendarService.java @@ -18,13 +18,7 @@ import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; @Service public class RoomCalendarService { @@ -107,6 +101,18 @@ public class RoomCalendarService { } } + if (StringUtils.isNotBlank(visibility.otherProperty) && StringUtils.isNotBlank(visibility.otherRoomType)) { + try { + HttpResponseResult response = mgmApiService.invokeRequestRoomCalendar( + playerId, visibility.otherProperty, visibility.otherRoomType, startDate, endDate, 0); + if (response.getStatusCode() == 200) { + allRecords.addAll(parseRoomCalendarResponse(response.getResponseContent())); + anySuccess = true; + } + } catch (Exception ignored) { + } + } + if (!anySuccess) { result.setSuccess(false); result.setMessage("RequestRoomCalendar failed"); @@ -147,11 +153,15 @@ public class RoomCalendarService { String operaRoomType = ""; String daylightProperty = ""; String daylightRoomType = ""; + String otherProperty = ""; + String otherRoomType = ""; List operaIds = new ArrayList<>(); List operaCodes = new ArrayList<>(); List daylightIds = new ArrayList<>(); List daylightCodes = new ArrayList<>(); + List otherIds = new ArrayList<>(); + List otherCodes = new ArrayList<>(); for (CfgProperties cfgProperty : visibleProperties) { String category = cfgProperty.getCategory(); if (StringUtils.equalsIgnoreCase(category, "OPERA")) { @@ -160,6 +170,9 @@ public class RoomCalendarService { } else if (StringUtils.equalsIgnoreCase(category, "DAYLIGHT")) { daylightIds.add(String.valueOf(cfgProperty.getId())); daylightCodes.add(cfgProperty.getCode()); + } else if (StringUtils.equalsIgnoreCase(category, "OTHER")) { + otherIds.add(String.valueOf(cfgProperty.getId())); + otherCodes.add(cfgProperty.getCode()); } } @@ -179,11 +192,21 @@ public class RoomCalendarService { } } - if (StringUtils.isBlank(operaRoomType) && StringUtils.isBlank(daylightRoomType)) { + if (!otherIds.isEmpty()) { + List visibleOtherRoomTypes = filterVisibleRoomTypes(roomTypeNames, rooms, otherIds); + if (!visibleOtherRoomTypes.isEmpty()) { + otherProperty = StringUtils.join(otherCodes, ","); + otherRoomType = StringUtils.join(visibleOtherRoomTypes, ","); + } + } + + if (StringUtils.isBlank(operaRoomType) && StringUtils.isBlank(daylightRoomType) + && StringUtils.isBlank(otherRoomType)) { return CalendarVisibilityCheck.failure("ROOMTYPENOSHOW", "Room type no show in calendar"); } - return CalendarVisibilityCheck.success(operaProperty, operaRoomType, daylightProperty, daylightRoomType); + return CalendarVisibilityCheck.success(operaProperty, operaRoomType, + daylightProperty, daylightRoomType, otherProperty, otherRoomType); } public GetPropertyRoomTypeListResponse getPropertyRoomType() { @@ -441,25 +464,32 @@ public class RoomCalendarService { private final String operaRoomType; private final String daylightProperty; private final String daylightRoomType; + private final String otherProperty; + private final String otherRoomType; private CalendarVisibilityCheck(String errorCode, String errorMessage, String operaProperty, String operaRoomType, - String daylightProperty, String daylightRoomType) { + String daylightProperty, String daylightRoomType, + String otherProperty, String otherRoomType) { this.errorCode = errorCode; this.errorMessage = errorMessage; this.operaProperty = operaProperty; this.operaRoomType = operaRoomType; this.daylightProperty = daylightProperty; this.daylightRoomType = daylightRoomType; + this.otherProperty = otherProperty; + this.otherRoomType = otherRoomType; } private static CalendarVisibilityCheck success(String operaProperty, String operaRoomType, - String daylightProperty, String daylightRoomType) { - return new CalendarVisibilityCheck(null, null, operaProperty, operaRoomType, daylightProperty, daylightRoomType); + String daylightProperty, String daylightRoomType, + String otherProperty, String otherRoomType) { + return new CalendarVisibilityCheck(null, null, operaProperty, operaRoomType, + daylightProperty, daylightRoomType, otherProperty, otherRoomType); } private static CalendarVisibilityCheck failure(String errorCode, String errorMessage) { - return new CalendarVisibilityCheck(errorCode, errorMessage, null, null, null, null); + return new CalendarVisibilityCheck(errorCode, errorMessage, null, null, null, null, null, null); } } } diff --git a/src/test/java/com/mgm/mcrm/PublicEndpointsMigrationTest.java b/src/test/java/com/mgm/mcrm/PublicEndpointsMigrationTest.java index b658217..e459b2e 100644 --- a/src/test/java/com/mgm/mcrm/PublicEndpointsMigrationTest.java +++ b/src/test/java/com/mgm/mcrm/PublicEndpointsMigrationTest.java @@ -19,7 +19,9 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.test.util.ReflectionTestUtils; import org.springframework.test.web.servlet.setup.MockMvcBuilders; + import java.util.concurrent.atomic.AtomicBoolean; + import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; diff --git a/src/test/java/com/mgm/mcrm/RefreshTokenMigrationTest.java b/src/test/java/com/mgm/mcrm/RefreshTokenMigrationTest.java index 96a8e24..6df496b 100644 --- a/src/test/java/com/mgm/mcrm/RefreshTokenMigrationTest.java +++ b/src/test/java/com/mgm/mcrm/RefreshTokenMigrationTest.java @@ -3,20 +3,26 @@ package com.mgm.mcrm; import com.auth0.jwt.JWT; import com.auth0.jwt.algorithms.Algorithm; import com.mgm.mcrm.authorization.dtos.LoginUserInfo; +import com.mgm.mcrm.authorization.filters.JwtAuthFilter; import com.mgm.mcrm.authorization.models.Token; import com.mgm.mcrm.authorization.repositories.TokenDao; import com.mgm.mcrm.authorization.services.UserTokenService; import com.mgm.mcrm.authorization.utils.JwtTokenUtil; -import com.mgm.mcrm.authorization.filters.JwtAuthFilter; import com.mgm.mcrm.common.utils.EncryptUtil; import org.apache.logging.log4j.util.Base64Util; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.springframework.mock.web.*; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.test.util.ReflectionTestUtils; -import java.time.*; -import java.util.*; + +import java.time.Instant; +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; + import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/src/test/java/com/mgm/mcrm/TodoIrcMigrationTest.java b/src/test/java/com/mgm/mcrm/TodoIrcMigrationTest.java index 59c53b5..0a95602 100644 --- a/src/test/java/com/mgm/mcrm/TodoIrcMigrationTest.java +++ b/src/test/java/com/mgm/mcrm/TodoIrcMigrationTest.java @@ -5,7 +5,8 @@ import com.alibaba.fastjson.parser.Feature; import com.fasterxml.jackson.databind.ObjectMapper; import com.mgm.mcrm.common.dtos.mgm_api.TodoDetailResult; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; + +import static org.junit.jupiter.api.Assertions.assertEquals; class TodoIrcMigrationTest { @Test diff --git a/src/test/java/com/mgm/mcrm/TodoNumericMigrationTest.java b/src/test/java/com/mgm/mcrm/TodoNumericMigrationTest.java index 5a8f9aa..b1f8e64 100644 --- a/src/test/java/com/mgm/mcrm/TodoNumericMigrationTest.java +++ b/src/test/java/com/mgm/mcrm/TodoNumericMigrationTest.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.mgm.mcrm.common.dtos.mgm_api.TodoDetailResult; import com.mgm.mcrm.common.dtos.mgm_api.TodoListRecord; import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.*; class TodoNumericMigrationTest { diff --git a/src/test/java/com/mgm/mcrm/TodoRemainingContractTest.java b/src/test/java/com/mgm/mcrm/TodoRemainingContractTest.java index 1d07938..d3a094e 100644 --- a/src/test/java/com/mgm/mcrm/TodoRemainingContractTest.java +++ b/src/test/java/com/mgm/mcrm/TodoRemainingContractTest.java @@ -2,19 +2,26 @@ package com.mgm.mcrm; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.databind.ObjectMapper; -import com.mgm.mcrm.common.dtos.mgm_api.*; -import com.mgm.mcrm.player.services.TodoService; -import com.mgm.mcrm.player.dtos.request.TodoCancelBookingRequest; import com.mgm.mcrm.appsetting.services.SysSettingService; -import com.mgm.mcrm.booking.models.*; -import com.mgm.mcrm.booking.repositories.*; -import com.mgm.mcrm.booking.services.OperaService; import com.mgm.mcrm.basesetting.property.repositories.PropertyDao; +import com.mgm.mcrm.booking.models.Bookings; +import com.mgm.mcrm.booking.models.BookingsView; +import com.mgm.mcrm.booking.repositories.BookingDao; +import com.mgm.mcrm.booking.repositories.BookingViewDao; +import com.mgm.mcrm.booking.services.OperaService; +import com.mgm.mcrm.common.dtos.mgm_api.TodoDateListResult; +import com.mgm.mcrm.common.dtos.mgm_api.TodoDetailDescription; +import com.mgm.mcrm.common.dtos.mgm_api.TodoListResult; +import com.mgm.mcrm.player.dtos.request.TodoCancelBookingRequest; +import com.mgm.mcrm.player.services.TodoService; import org.junit.jupiter.api.Test; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.test.util.ReflectionTestUtils; + import java.util.Optional; -import static org.junit.jupiter.api.Assertions.*; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.mockito.Mockito.*; class TodoRemainingContractTest { diff --git a/src/test/java/com/mgm/mcrm/roomcalendar/CalendarBootstrapMigrationTest.java b/src/test/java/com/mgm/mcrm/roomcalendar/CalendarBootstrapMigrationTest.java index 50425ee..3ee92ef 100644 --- a/src/test/java/com/mgm/mcrm/roomcalendar/CalendarBootstrapMigrationTest.java +++ b/src/test/java/com/mgm/mcrm/roomcalendar/CalendarBootstrapMigrationTest.java @@ -7,14 +7,20 @@ import com.mgm.mcrm.appsetting.repositories.SettingDao; import com.mgm.mcrm.appsetting.services.SettingService; import com.mgm.mcrm.authorization.models.SysGroupPermission; import com.mgm.mcrm.authorization.models.SysUserView; -import com.mgm.mcrm.authorization.repositories.*; +import com.mgm.mcrm.authorization.repositories.SysGroupPermissionDao; +import com.mgm.mcrm.authorization.repositories.SysUserViewDao; import com.mgm.mcrm.authorization.services.MgmUserService; import com.mgm.mcrm.authorization.services.UserTokenService; -import com.mgm.mcrm.basesetting.property.repositories.*; -import com.mgm.mcrm.basesetting.team.repositories.*; +import com.mgm.mcrm.basesetting.property.repositories.BlockDao; +import com.mgm.mcrm.basesetting.property.repositories.PropertyDao; +import com.mgm.mcrm.basesetting.team.repositories.DepartmentDao; +import com.mgm.mcrm.basesetting.team.repositories.DivisionDao; +import com.mgm.mcrm.basesetting.team.repositories.SectionDao; +import com.mgm.mcrm.basesetting.team.repositories.TeamStructureDao; import com.mgm.mcrm.common.config.WebFilterConfig; import com.mgm.mcrm.common.dtos.http_util.HttpResponseResult; import com.mgm.mcrm.common.services.MGMApiService; +import jakarta.servlet.FilterChain; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; @@ -25,8 +31,10 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.test.util.ReflectionTestUtils; -import jakarta.servlet.FilterChain; -import java.util.*; + +import java.util.ArrayList; +import java.util.List; + import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/src/test/java/com/mgm/mcrm/roomcalendar/CalendarMockDataTest.java b/src/test/java/com/mgm/mcrm/roomcalendar/CalendarMockDataTest.java index 8d2f6f8..e94a241 100644 --- a/src/test/java/com/mgm/mcrm/roomcalendar/CalendarMockDataTest.java +++ b/src/test/java/com/mgm/mcrm/roomcalendar/CalendarMockDataTest.java @@ -1,14 +1,17 @@ package com.mgm.mcrm.roomcalendar; -import com.mgm.mcrm.roomcalendar.services.*; -import com.mgm.mcrm.appsetting.services.SettingService; import com.mgm.mcrm.appsetting.repositories.SettingDao; +import com.mgm.mcrm.appsetting.services.SettingService; import com.mgm.mcrm.basesetting.property.repositories.PropertyDao; import com.mgm.mcrm.basesetting.room.repositories.RoomDao; import com.mgm.mcrm.common.services.MGMApiService; +import com.mgm.mcrm.roomcalendar.services.CalendarMockData; +import com.mgm.mcrm.roomcalendar.services.RoomCalendarService; import org.junit.jupiter.api.Test; import org.springframework.test.util.ReflectionTestUtils; + import java.util.*; + import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/src/test/java/com/mgm/mcrm/roomcalendar/CalendarQueryMigrationTest.java b/src/test/java/com/mgm/mcrm/roomcalendar/CalendarQueryMigrationTest.java index 9efc80b..dc2a21a 100644 --- a/src/test/java/com/mgm/mcrm/roomcalendar/CalendarQueryMigrationTest.java +++ b/src/test/java/com/mgm/mcrm/roomcalendar/CalendarQueryMigrationTest.java @@ -19,7 +19,12 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.test.util.ReflectionTestUtils; -import java.util.*; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*;