add calendar module
This commit is contained in:
@@ -59,11 +59,10 @@ public class WebFilterConfig {
|
||||
JwtTokenUtil.setAppSessionExpiration(apiTokenExpiration);
|
||||
JwtTokenUtil.setAppSessionExpiration(mobileSessionExpiration);
|
||||
List<String> excludePatterns = Arrays.asList(
|
||||
"/api/system/write_log",
|
||||
"/api/system/sys_setting/get_list",
|
||||
"/api/system/write_public_log",
|
||||
"/api/system/sys_setting/get_public_login_settings",
|
||||
"/api/app/sso/*",
|
||||
"/api/app/booking/mock_cancel",
|
||||
"/api/web/setting/get_setting_by_key",
|
||||
"/api/web/setting/get_public_setting_by_key",
|
||||
"/swagger*/*",
|
||||
"/v3/**",
|
||||
"/api-docs",
|
||||
|
||||
@@ -26,5 +26,6 @@ public class SysConstants {
|
||||
public static final String PERMISSION_APP_TODO_LIST="10001_03";
|
||||
public static final String PERMISSION_APP_DASHBOARD="10001_04";
|
||||
public static final String PERMISSION_APP_APPROVAL="10001_05";
|
||||
public static final String PERMISSION_APP_CALENDAR="10001_07";
|
||||
|
||||
}
|
||||
|
||||
@@ -21,14 +21,19 @@ public class TodoDetailResult {
|
||||
private String Salutation = null;
|
||||
private String Location=null;
|
||||
private String ActivePrgId=null;
|
||||
private Integer PrgTO=null;
|
||||
private Integer PrgWin=null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "PrgTO")
|
||||
private String PrgTO = null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "PrgWin")
|
||||
private String PrgWin = null;
|
||||
private Double TORIPercentage=null;
|
||||
private Integer FrontMoney=null;
|
||||
private Integer TTO=null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "FrontMoney")
|
||||
private String FrontMoney = null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "TTO")
|
||||
private String TTO = null;
|
||||
|
||||
@JsonProperty("01CompBalance")
|
||||
private Integer ComBalance=null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "01CompBalance")
|
||||
private String ComBalance = null;
|
||||
|
||||
private String R3MTO=null;
|
||||
private String R3MTOD=null;
|
||||
@@ -42,21 +47,42 @@ public class TodoDetailResult {
|
||||
private String R6MTPD=null;
|
||||
private String R6MTheo = null;
|
||||
private String R6MRIPercentage=null;
|
||||
private Integer ExpComm=null;
|
||||
private Integer NetCreditOutstanding=null;
|
||||
private Integer UnsettledExpenses=null;
|
||||
private Integer TodayTo=null;
|
||||
private Integer TodayTPD=null;
|
||||
private Integer TodayWin=null;
|
||||
private Integer TodayTheo = null;
|
||||
private Integer TripWin=null;
|
||||
private Integer TripTPD=null;
|
||||
private Integer TripTheo = null;
|
||||
private Double TripRIPercentage=null;
|
||||
private Integer YesterdayTO=null;
|
||||
private Integer YesterdayWin=null;
|
||||
private Integer YesterdayPlayHour=null;
|
||||
private Integer AveragePlayHour = null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "ExpComm")
|
||||
private String ExpComm = null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "IRCProgramFundBalance")
|
||||
@JsonProperty("iRCProgramFundBalance")
|
||||
private String ircProgramFundBalance = null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "NetCreditOutstanding")
|
||||
private String NetCreditOutstanding = null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "UnsettledExpenses")
|
||||
private String UnsettledExpenses = null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "TodayTo")
|
||||
private String TodayTo = null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "TodayTPD")
|
||||
private String TodayTPD = null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "TodayWin")
|
||||
private String TodayWin = null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "TodayTheo")
|
||||
private String TodayTheo = null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "TripWin")
|
||||
private String TripWin = null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "TripTPD")
|
||||
private String TripTPD = null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "TripTheo")
|
||||
private String TripTheo = null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "TripRIPercentage")
|
||||
private String TripRIPercentage = null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "YesterdayTO")
|
||||
private String YesterdayTO = null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "YesterdayWin")
|
||||
private String YesterdayWin = null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "YesterdayPlayHour")
|
||||
private String YesterdayPlayHour = null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "AveragePlayHour")
|
||||
private String AveragePlayHour = null;
|
||||
@com.alibaba.fastjson.annotation.JSONField(name = "HouseAdvantagePercentage")
|
||||
@JsonProperty("HouseAdvantagePercentage")
|
||||
private String houseAdvantage = null;
|
||||
private List<TodoDetailDescription> Descriptions = new ArrayList<TodoDetailDescription>();
|
||||
public TodoDetailResult() {
|
||||
}
|
||||
|
||||
@@ -211,6 +211,11 @@ public class TodoListRecord {
|
||||
return MAId;
|
||||
}
|
||||
|
||||
@com.fasterxml.jackson.annotation.JsonProperty("maId")
|
||||
public Integer getCalendarMaId() {
|
||||
return MAId;
|
||||
}
|
||||
|
||||
public void setMAId(Integer mAId) {
|
||||
MAId = mAId;
|
||||
}
|
||||
|
||||
@@ -26,6 +26,7 @@ public class UserInfoApiRecord {
|
||||
private boolean canViewTodoList=false;
|
||||
private boolean canViewDashboard=false;
|
||||
private boolean canViewApproval=false;
|
||||
private boolean canViewCalendar=false;
|
||||
private String groupName;
|
||||
private String phone;
|
||||
private boolean loginTag;
|
||||
|
||||
@@ -44,8 +44,38 @@ public class MGMApiService {
|
||||
private static final String API_GET_APPROVER_DATA="/RequestWaitlistData";
|
||||
private static final String API_GET_APPROVER="/RequestRoomBookingApprovalRouting";
|
||||
private static final String API_GET_TODO_LIST = "/GetTodolist";
|
||||
private static final String API_REQUEST_ROOM_CALENDAR = "/RequestRoomCalendar";
|
||||
|
||||
|
||||
public HttpResponseResult invokeRequestRoomCalendar(
|
||||
String playerId,
|
||||
String property,
|
||||
String roomType,
|
||||
String startDate,
|
||||
String endDate) throws Exception {
|
||||
return invokeRequestRoomCalendar(playerId, property, roomType, startDate, endDate, 0);
|
||||
}
|
||||
|
||||
public HttpResponseResult invokeRequestRoomCalendar(
|
||||
String playerId,
|
||||
String property,
|
||||
String roomType,
|
||||
String startDate,
|
||||
String endDate,
|
||||
int type) throws Exception {
|
||||
JSONObject requestObj = new JSONObject();
|
||||
Map<String, String> requestHeader = new HashMap<>();
|
||||
requestHeader.put("Authorization", getAccessToken());
|
||||
if (StringUtils.isNotBlank(playerId)) {
|
||||
requestObj.put("PlayerId", playerId);
|
||||
}
|
||||
requestObj.put("Property", property);
|
||||
requestObj.put("RoomType", roomType);
|
||||
requestObj.put("StartDate", startDate);
|
||||
requestObj.put("EndDate", endDate);
|
||||
return invokeESBAPI(ESB_Server, API_REQUEST_ROOM_CALENDAR, requestObj, "POST", requestHeader, type);
|
||||
}
|
||||
|
||||
public HttpResponseResult invokeGetPlayerProfile(
|
||||
String playerId,
|
||||
String userId) throws Exception {
|
||||
@@ -416,4 +446,4 @@ public class MGMApiService {
|
||||
LogUtil.info(MGMApiService.class, "[invokeESBAPI]SpendTime:" + spanTime + "ms");
|
||||
return httpResult;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user