Mauve/mgm-daylight-mcrm-api-mobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

optimize codes

Browse Source
This commit is contained in:
Mauve
2026-09-15 17:04:06 +08:00
parent 58d4b42901
commit 67e8e056ba
282 changed files with 1193 additions and 1760 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/mgm/mcrm/adfs/controllers/SSOCallbackController.java
+3 -4
View File
@@ -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 {
src/main/java/com/mgm/mcrm/adfs/controllers/SSORestProcessController.java
+21 -26
View File
@@ -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
src/main/java/com/mgm/mcrm/allotment/models/CfgAppChannel.java
+3 -8
View File
@@ -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")
src/main/java/com/mgm/mcrm/allotment/models/CfgOtherAllotment.java
+3 -4
View File
@@ -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 {
src/main/java/com/mgm/mcrm/allotment/models/CfgOtherAllotmentView.java
+8 -9
View File
@@ -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({
src/main/java/com/mgm/mcrm/allotment/models/CfgOtherAppChannel.java
+2 -6
View File
@@ -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)
src/main/java/com/mgm/mcrm/allotment/models/CfgRoomCriterias.java
+10 -25
View File
@@ -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")
src/main/java/com/mgm/mcrm/allotment/repositories/AppChannelDao.java
+3 -6
View File
@@ -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<CfgAppChannel, String> {
public interface AppChannelDao extends JpaRepository<CfgAppChannel, CfgAppChannelKey> {
}
src/main/java/com/mgm/mcrm/allotment/repositories/OtherAllotmentDao.java
+4 -6
View File
@@ -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;
src/main/java/com/mgm/mcrm/allotment/repositories/OtherAllotmentViewDao.java
+4 -3
View File
@@ -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<CfgOtherAllotmentView, Long> {
@EntityGraph(value = "graph.OtherAllotment.fulldetails",type = EntityGraph.EntityGraphType.LOAD)
src/main/java/com/mgm/mcrm/allotment/repositories/RoomCriteriaDao.java
+4 -5
View File
@@ -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<CfgRoomCriterias, String> {
public interface RoomCriteriaDao extends JpaRepository<CfgRoomCriterias, Long> {
CfgRoomCriterias findById(long id);
List<CfgRoomCriterias> findAll(Specification<CfgRoomCriterias> spec,Sort sort);
List<CfgRoomCriterias> findAll(Specification<CfgRoomCriterias> spec);
src/main/java/com/mgm/mcrm/approval/controller/ApprovalController.java
-2
View File
@@ -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;
src/main/java/com/mgm/mcrm/approval/service/ApprovalService.java
+4 -2
View File
@@ -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;
src/main/java/com/mgm/mcrm/appsetting/controllers/CfgSettingController.java
+2 -3
View File
@@ -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
src/main/java/com/mgm/mcrm/appsetting/controllers/ConfigController.java
+7 -10
View File
@@ -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 = "*")
src/main/java/com/mgm/mcrm/appsetting/dtos/AvailableRoomQueryRequest.java
-2
View File
@@ -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)
src/main/java/com/mgm/mcrm/appsetting/dtos/ExtendBookingQueryRequest.java
-4
View File
@@ -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 {
src/main/java/com/mgm/mcrm/appsetting/dtos/RoomQueryRequest.java
-1
View File
@@ -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
src/main/java/com/mgm/mcrm/appsetting/models/CfgSettings.java
+2 -1
View File
@@ -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 {
src/main/java/com/mgm/mcrm/appsetting/models/SysSetting.java
+2 -6
View File
@@ -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")
src/main/java/com/mgm/mcrm/appsetting/repositories/SettingDao.java
+1 -1
View File
@@ -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<CfgSettings, String> {
@Query(value = "select * from cfg_settings with (nolock) where keys = ?1",nativeQuery=true)
src/main/java/com/mgm/mcrm/appsetting/repositories/SysSettingDao.java
+2 -3
View File
@@ -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<SysSetting, String> {
src/main/java/com/mgm/mcrm/appsetting/services/ConfigService.java
+25 -37
View File
@@ -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;
src/main/java/com/mgm/mcrm/appsetting/services/SettingService.java
+6 -6
View File
@@ -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 {
src/main/java/com/mgm/mcrm/appsetting/services/SysSettingService.java
+3 -4
View File
@@ -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 {
src/main/java/com/mgm/mcrm/authorization/controllers/MobileLoginController.java
+19 -16
View File
@@ -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
src/main/java/com/mgm/mcrm/authorization/dtos/LoginInfo.java
+3 -3
View File
@@ -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;
src/main/java/com/mgm/mcrm/authorization/filters/JwtAuthFilter.java
-1
View File
@@ -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;
src/main/java/com/mgm/mcrm/authorization/models/SysGroup.java
+4 -10
View File
@@ -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
src/main/java/com/mgm/mcrm/authorization/models/SysGroupDataPermission.java
+1 -7
View File
@@ -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;
src/main/java/com/mgm/mcrm/authorization/models/SysGroupPermission.java
+1 -6
View File
@@ -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;
src/main/java/com/mgm/mcrm/authorization/models/SysRouter.java
+4 -15
View File
@@ -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
src/main/java/com/mgm/mcrm/authorization/models/SysRouterPermission.java
+1 -5
View File
@@ -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;
src/main/java/com/mgm/mcrm/authorization/models/SysUser.java
+3 -10
View File
@@ -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
src/main/java/com/mgm/mcrm/authorization/models/SysUserSetting.java
+1 -14
View File
@@ -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
src/main/java/com/mgm/mcrm/authorization/models/SysUserView.java
+4 -11
View File
@@ -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
src/main/java/com/mgm/mcrm/authorization/repositories/SysGroupDao.java
+2 -5
View File
@@ -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;
src/main/java/com/mgm/mcrm/authorization/repositories/SysGroupDataPermissionDao.java
+3 -3
View File
@@ -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<SysGroupDataPermission, String> {
public interface SysGroupDataPermissionDao extends JpaRepository<SysGroupDataPermission, Long> {
List<SysGroupDataPermission> findAll(Specification<SysGroupDataPermission> spec,Sort sort);
List<SysGroupDataPermission> findAll(Specification<SysGroupDataPermission> spec);
src/main/java/com/mgm/mcrm/authorization/repositories/SysGroupPermissionDao.java
+4 -3
View File
@@ -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<SysGroupPermission, String> {
public interface SysGroupPermissionDao extends JpaRepository<SysGroupPermission, SysGroupPermissionKey> {
List<SysGroupPermission> findAll(Specification<SysGroupPermission> spec,Sort sort);
List<SysGroupPermission> findAll(Specification<SysGroupPermission> spec);
src/main/java/com/mgm/mcrm/authorization/repositories/SysRouterDao.java
+2 -5
View File
@@ -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;
src/main/java/com/mgm/mcrm/authorization/repositories/SysRouterPermissionDao.java
+2 -2
View File
@@ -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<SysRouterPermission, String> {
List<SysRouterPermission> findAll(Specification<SysRouterPermission> spec, Sort sort);
src/main/java/com/mgm/mcrm/authorization/repositories/SysUserDao.java
+3 -3
View File
@@ -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<SysUser, String> {
public interface SysUserDao extends JpaRepository<SysUser, Long> {
SysUser findById(long id);
List<SysUser> findAll(Specification<SysUser> spec,Sort sort);
List<SysUser> findAll(Specification<SysUser> spec);
src/main/java/com/mgm/mcrm/authorization/repositories/SysUserSettingDao.java
+2 -4
View File
@@ -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<SysUserSetting, String> {
public interface SysUserSettingDao extends JpaRepository<SysUserSetting, SysUserSettingKey> {
}
src/main/java/com/mgm/mcrm/authorization/repositories/SysUserViewDao.java
+3 -3
View File
@@ -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<SysUserView, String> {
public interface SysUserViewDao extends JpaRepository<SysUserView, Long> {
SysUserView findById(long id);
List<SysUserView> findAll(Specification<SysUserView> spec,Sort sort);
List<SysUserView> findAll(Specification<SysUserView> spec);
src/main/java/com/mgm/mcrm/authorization/repositories/TokenDao.java
+1 -1
View File
@@ -9,7 +9,7 @@ import org.springframework.transaction.annotation.Transactional;
public interface TokenDao extends JpaRepository<Token, String> {
public interface TokenDao extends JpaRepository<Token, Long> {
Token findById(long id);
@Deprecated
src/main/java/com/mgm/mcrm/authorization/services/AuthorizationService.java
+7 -13
View File
@@ -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 {
src/main/java/com/mgm/mcrm/authorization/services/MgmUserService.java
+19 -22
View File
@@ -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 {
src/main/java/com/mgm/mcrm/authorization/services/UserTokenService.java
+2 -2
View File
@@ -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;
src/main/java/com/mgm/mcrm/basesetting/agebucket/models/SysAgebucket.java
+3 -9
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/agebucket/services/AgebucketService.java
+1 -1
View File
@@ -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 {
src/main/java/com/mgm/mcrm/basesetting/daylight/dtos/response/ReservationDoorKeyResponse.java
+4
View File
@@ -8,4 +8,8 @@ public class ReservationDoorKeyResponse {
private String id;
private boolean hasKey;
private String roomId;
private String roomNumber;
}
src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgBlockCodes.java
+4 -10
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgDaylightMapping.java
+3 -3
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgDaylightView.java
+9 -12
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptDaylightRoomTypes.java
+3 -7
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptionDaylight.java
+3 -9
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptionDaylightView.java
+8 -9
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgExceptionOperaView.java
+8 -9
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgItemInventory.java
+3 -8
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgMarketCodes.java
+3 -8
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgNonMGMStatusMapping.java
+5 -14
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgOperaView.java
+8 -9
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgOtherFollowUpStatus.java
+2 -7
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgOtherSegment.java
+2 -8
View File
@@ -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 {
src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgRateCodes.java
+3 -8
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgSourceCodes.java
+3 -8
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/daylight/models/CfgTiers.java
+3 -9
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/BlockCodeDao.java
+2 -3
View File
@@ -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<CfgBlockCodes, Long> {
src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/DaylightDao.java
+2 -3
View File
@@ -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, Long> {
CfgDaylightMapping findById(long id);
src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/DaylightViewDao.java
+3 -5
View File
@@ -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<CfgDaylightView, Long> {
@EntityGraph(value = "graph.DaylightMapping.fulldetails",type = EntityGraph.EntityGraphType.LOAD)
src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/ExceptionDaylightDao.java
+2 -3
View File
@@ -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, Long> {
CfgExceptionDaylight findById(long id);
src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/ExceptionDaylightViewDao.java
+3 -3
View File
@@ -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<CfgExceptionDaylightView, Long> {
src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/ItemInventoryDao.java
+3 -3
View File
@@ -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, Long> {
CfgItemInventory findByTierIdAndRoomId(Long tierId,Long roomId);
src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/MarketCodeDao.java
+2 -3
View File
@@ -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<CfgMarketCodes, Long> {
src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/OperaViewDao.java
-3
View File
@@ -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<CfgOperaView, Long> {
src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/OtherSegmentDao.java
+2 -3
View File
@@ -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<CfgOtherSegment, Long> {
src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/RateCodeDao.java
+2 -3
View File
@@ -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<CfgRateCodes, Long> {
src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/SourceCodeDao.java
+3 -4
View File
@@ -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<CfgSourceCodes, Long> {
src/main/java/com/mgm/mcrm/basesetting/daylight/repositories/TierDao.java
+3 -3
View File
@@ -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, Long> {
CfgTiers findByTierNameAndCategory(String string, String category);
src/main/java/com/mgm/mcrm/basesetting/daylight/services/DaylightService.java
+24 -4
View File
@@ -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<CfgRoomTypes> roomRoomType = room.getRoomRoomType();
for(CfgRoomTypes type:roomRoomType) {
dlRoomTypeId = type.getDlRoomTypeId();
src/main/java/com/mgm/mcrm/basesetting/property/dtos/response/DayLightProfileResponse.java
-3
View File
@@ -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;
src/main/java/com/mgm/mcrm/basesetting/property/dtos/response/ResultResponse.java
-4
View File
@@ -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：
* {
src/main/java/com/mgm/mcrm/basesetting/property/models/CfgBlocks.java
+2 -8
View File
@@ -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 {
src/main/java/com/mgm/mcrm/basesetting/property/models/CfgProperties.java
+3 -8
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/property/repositories/BlockDao.java
+2 -3
View File
@@ -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;
src/main/java/com/mgm/mcrm/basesetting/property/repositories/PropertyDao.java
+4 -5
View File
@@ -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<CfgProperties, String> {
public interface PropertyDao extends JpaRepository<CfgProperties, Long> {
@Query(value="select * from cfg_properties with (nolock) where id=?1",nativeQuery=true)
CfgProperties getById(long id);
src/main/java/com/mgm/mcrm/basesetting/room/models/CfgBedTypeMapping.java
+3 -9
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/room/models/CfgBedTypeMappingView.java
+2 -7
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/room/models/CfgOtherRoomStatus.java
+2 -7
View File
@@ -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 {
src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRoomFeatures.java
+3 -8
View File
@@ -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
src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRoomTypes.java
+3 -8
View File
@@ -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
src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRooms.java
+6 -7
View File
@@ -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")
src/main/java/com/mgm/mcrm/basesetting/room/models/CfgRoomsRoomTypes.java
+2 -6
View File
@@ -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)
src/main/java/com/mgm/mcrm/basesetting/room/repositories/BedTypeMappingDao.java
+2 -3
View File
@@ -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<CfgBedTypeMapping, Integer> {
src/main/java/com/mgm/mcrm/basesetting/room/repositories/OtherRoomStatusDao.java
+2 -3
View File
@@ -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<CfgOtherRoomStatus, Long> {
src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomDao.java
+4 -14
View File
@@ -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<CfgRooms, String> {
public interface RoomDao extends JpaRepository<CfgRooms, Long> {
@EntityGraph(value = "graph.RoomSetting.fulldetails",type = EntityGraph.EntityGraphType.LOAD)
CfgRooms findById(long id);
@@ -29,13 +26,6 @@ public interface RoomDao extends JpaRepository<CfgRooms, String> {
Page<CfgRooms> findAll(Specification<CfgRooms> 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 "
src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomFeatureDao.java
+2 -3
View File
@@ -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<CfgRoomFeatures, Integer> {
List<CfgRoomFeatures> findAll(Specification<CfgRoomFeatures> spec);
src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomRoomTypeDao.java
+4 -4
View File
@@ -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<CfgRoomsRoomTypes, Long> {
public interface RoomRoomTypeDao extends JpaRepository<CfgRoomsRoomTypes, CfgRoomsRoomTypesKey> {
List<CfgRoomsRoomTypes> findByRoomTypeId(Long roomTypeId);
@Query(value="select * from cfg_rooms_room_types where room_id =?1",nativeQuery=true)
src/main/java/com/mgm/mcrm/basesetting/room/repositories/RoomTypeDao.java
+3 -4
View File
@@ -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<CfgRoomTypes, String> {
public interface RoomTypeDao extends JpaRepository<CfgRoomTypes, Long> {
CfgRoomTypes findById(long id);
CfgRoomTypes findByCodeAndCategory(String code,String category);
List<CfgRoomTypes> findAll(Specification<CfgRoomTypes> spec,Sort sort);
src/main/java/com/mgm/mcrm/basesetting/room/services/OtherRoomStatusService.java
+2 -3
View File
@@ -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 {

Some files were not shown because too many files have changed in this diff Show More