메뉴배너 관련 수정
This commit is contained in:
@@ -14,6 +14,7 @@ public interface MenuMapper {
|
||||
MenuBanner getBannerDetail(Long id);
|
||||
List<Message> getMessage(Long id);
|
||||
List<MenuBanner> getScheduleBannerList();
|
||||
int getMaxOrderId();
|
||||
|
||||
void insertBanner(MenuRequest mailRequest);
|
||||
void insertMessage(Map map);
|
||||
|
||||
@@ -29,6 +29,8 @@ public class MenuBanner {
|
||||
private LocalDateTime endDt;
|
||||
@JsonProperty("is_link")
|
||||
private boolean isLink;
|
||||
@JsonProperty("order_id")
|
||||
private Integer orderId;
|
||||
|
||||
@JsonProperty("create_by")
|
||||
private String createBy;
|
||||
|
||||
@@ -25,6 +25,8 @@ public class MenuRequest {
|
||||
private boolean isLink;
|
||||
@JsonProperty("link_list")
|
||||
private List<Message> linkList;
|
||||
@JsonProperty("order_id")
|
||||
private Integer orderId;
|
||||
|
||||
@JsonProperty("create_by")
|
||||
private Long createBy;
|
||||
|
||||
@@ -149,6 +149,9 @@ public class MenuService {
|
||||
public MenuResponse postBanner(MenuRequest menuRequest){
|
||||
menuRequest.setCreateBy(CommonUtils.getAdmin().getId());
|
||||
|
||||
int maxOrderId = menuMapper.getMaxOrderId();
|
||||
menuRequest.setOrderId(maxOrderId+1);
|
||||
|
||||
menuMapper.insertBanner(menuRequest);
|
||||
|
||||
long banner_id = menuRequest.getId();
|
||||
@@ -163,7 +166,8 @@ public class MenuService {
|
||||
File file = fileUtils.loadFileObject(temp_file);
|
||||
String fileUri = "";
|
||||
try{
|
||||
fileUri = s3Service.uploadFile(file, CommonConstants.S3_MENU_BANNER_DIRECTORY + banner_id, contentType);
|
||||
String directory = String.format("%s/%s-%d", CommonConstants.S3_MENU_BANNER_DIRECTORY, CommonConstants.S3_MENU_BANNER_DIRECTORY, banner_id);
|
||||
fileUri = s3Service.uploadFile(file, directory, contentType);
|
||||
}catch (S3Exception e) {
|
||||
log.error("S3 오류: {}", e.getMessage());
|
||||
throw new RestApiException(CommonCode.ERROR.getHttpStatus(), ErrorCode.ERROR_FILE_S3_UPLOAD.getMessage());
|
||||
|
||||
@@ -5,7 +5,7 @@ public class CommonConstants {
|
||||
public static final String FALSE = "False";
|
||||
public static final String NONE = "None";
|
||||
public static final String SCHEDULE = "Schedule";
|
||||
public static final int BATTLE_SERVER_WAIT_TIME = 600; // (seconds) 이벤트 홍보시간이 300초인데 여유있게 처리하게 하기위해 600으로 준다.
|
||||
public static final int BATTLE_SERVER_WAIT_TIME = 300; // (seconds) 이벤트 홍보시간이 300초인데 여유있게 처리하게 하기위해 600으로 준다.
|
||||
public static final int BATTLE_INSTANCE_ID = 1017007;
|
||||
public static final String CALIUM_ITEM_CODE = "19010003";
|
||||
public static final String CALIVERSE_CODE = "CALIVERSE";
|
||||
@@ -16,7 +16,7 @@ public class CommonConstants {
|
||||
public static final String LAND_EVENT = "event";
|
||||
public static final String SYSTEM_MAIL_LAND_TRANS_KEY = "LandTrans";
|
||||
public static final int DYNAMODB_PAGING_SIZE = 30;
|
||||
public static final String S3_MENU_BANNER_DIRECTORY = "banner-";
|
||||
public static final String S3_MENU_BANNER_DIRECTORY = "menuBanner";
|
||||
public static final String GUID = "GUID";
|
||||
public static final String NICKNAME = "NICKNAME";
|
||||
public static final String EMAIL = "EMAIL";
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
package com.caliverse.admin.global.common.constants;
|
||||
|
||||
public class MetadataConstants {
|
||||
public static final String JSON_LIST_TEXT_STRING = "TextStringMetaDataList";
|
||||
public static final String JSON_LIST_ITEM = "ItemMetaDataList";
|
||||
public static final String JSON_LIST_CLOTH_TYPE = "ClothEquipTypeDataList";
|
||||
public static final String JSON_LIST_TOOL = "ToolMetaDataList";
|
||||
public static final String JSON_LIST_BAN_WORD = "BanWordMetaDataList";
|
||||
public static final String JSON_LIST_QUEST = "QuestMetaDataList";
|
||||
public static final String JSON_LIST_BUILDING = "BuildingMetaDataList";
|
||||
public static final String JSON_LIST_LAND = "LandMetaDataList";
|
||||
public static final String JSON_LIST_BATTLE_CONFIG = "BattleFFAConfigMetaDataList";
|
||||
public static final String JSON_LIST_BATTLE_REWARD = "BattleFFARewardMetaDataList";
|
||||
public static final String JSON_LIST_SYSTEM_META = "SystemMailMetaDataList";
|
||||
}
|
||||
Reference in New Issue
Block a user