bcjang/operationSystem-back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

item dw batch 추가

Browse Source 
게임로그 아이템 조회 API
게임로그 재화(아이템) 조회 API
엑셀 export 예외 필드 추가
This commit is contained in:
bcjang
2025-07-13 11:49:59 +09:00
parent 8d640b082f
commit e5430526ae
9 changed files with 206 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/main/java/com/caliverse/admin/domain/api/GameController.java Normal file
View File

@@ -0,0 +1,77 @@
package com.caliverse.admin.domain.api;
import com.caliverse.admin.domain.request.BattleEventRequest;
import com.caliverse.admin.domain.response.BattleEventResponse;
import com.caliverse.admin.domain.service.BattleEventService;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
@Tag(name = "게임", description = "게임 api")
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/v1/game")
public class GameController {
private final BattleEventService battleEventService;
@GetMapping("/setting/list")
public ResponseEntity<BattleEventResponse> getGameSettingList(
@RequestParam Map<String, String> requestParam){
return ResponseEntity.ok().body( battleEventService.getBattleEventList(requestParam));
}
@GetMapping("/setting/detail/{id}")
public ResponseEntity<BattleEventResponse> getGameSettingDetail(
@PathVariable("id") Long id){
return ResponseEntity.ok().body( battleEventService.getBattleEventDetail(id));
}
@PostMapping("/setting")
public ResponseEntity<BattleEventResponse> postGameSetting(
@RequestBody BattleEventRequest battleEventRequest){
return ResponseEntity.ok().body(battleEventService.postBattleEvent(battleEventRequest));
}
@PutMapping("/setting/{id}")
public ResponseEntity<BattleEventResponse> updateGameSetting(
@PathVariable("id")Long id, @RequestBody BattleEventRequest battleEventRequest){
return ResponseEntity.ok().body(battleEventService.updateBattleEvent(id, battleEventRequest));
}
@GetMapping("/match/list")
public ResponseEntity<BattleEventResponse> getGameMatchList(
@RequestParam Map<String, String> requestParam){
return ResponseEntity.ok().body( battleEventService.getBattleEventList(requestParam));
}
@GetMapping("/match/detail/{id}")
public ResponseEntity<BattleEventResponse> getGameMatchDetail(
@PathVariable("id") Long id){
return ResponseEntity.ok().body( battleEventService.getBattleEventDetail(id));
}
@PostMapping("/match")
public ResponseEntity<BattleEventResponse> postGameMatch(
@RequestBody BattleEventRequest battleEventRequest){
return ResponseEntity.ok().body(battleEventService.postBattleEvent(battleEventRequest));
}
@PutMapping("/match/{id}")
public ResponseEntity<BattleEventResponse> updateGameMatch(
@PathVariable("id")Long id, @RequestBody BattleEventRequest battleEventRequest){
return ResponseEntity.ok().body(battleEventService.updateBattleEvent(id, battleEventRequest));
}
@DeleteMapping("/match/delete")
public ResponseEntity<BattleEventResponse> deleteGameMatch(
@RequestBody BattleEventRequest battleEventRequest){
return ResponseEntity.ok().body(battleEventService.deleteBattleEvent(battleEventRequest));
}
}

24
src/main/java/com/caliverse/admin/domain/api/LogController.java
View File

@@ -60,4 +60,28 @@ public class LogController {
@RequestBody LogGameRequest logGameRequest){
logService.currencyExcelExport(response, logGameRequest);
}
@GetMapping("/item/detail/list")
public ResponseEntity<LogResponse> itemDetailList(
@RequestParam Map<String, String> requestParams){
return ResponseEntity.ok().body( logService.getItemDetailLogList(requestParams));
}
@PostMapping("/item/detail/excel-export")
public void itemDetailExcelExport(HttpServletResponse response,
@RequestBody LogGameRequest logGameRequest){
logService.itemDetailExcelExport(response, logGameRequest);
}
@GetMapping("/currency-item/list")
public ResponseEntity<LogResponse> currencyItemList(
@RequestParam Map<String, String> requestParams){
return ResponseEntity.ok().body( logService.getCurrencyItemLogList(requestParams));
}
@PostMapping("/currency-item/excel-export")
public void currencyItemExcelExport(HttpServletResponse response,
@RequestBody LogGameRequest logGameRequest){
logService.currencyItemExcelExport(response, logGameRequest);
}
}

11
src/main/java/com/caliverse/admin/domain/entity/EQuestType.java Normal file
View File

@@ -0,0 +1,11 @@
package com.caliverse.admin.domain.entity;
public enum EQuestType {
NONE,
EPIC,
TUTORIAL,
NORMAL,
UGQ
;
}

35
src/main/java/com/caliverse/admin/domain/entity/GameModeSetting.java Normal file
View File

@@ -0,0 +1,35 @@
package com.caliverse.admin.domain.entity;
import com.caliverse.admin.domain.entity.metaEnum.EJoinInProgressType;
import com.caliverse.admin.domain.entity.metaEnum.ETeamAssignmentType;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
import lombok.Setter;
import java.util.List;
@Getter @Setter
public class GameModeSetting {
private Integer id;
private String desc;
@JsonProperty("mmr_check")
private boolean mmrCheck;
@JsonProperty("party_match_player_count_able_array")
private List<Integer> partyMatchPlayerCountAbleArray;
@JsonProperty("match_wait_time_sec")
private Integer matchWaitTimeSec;
@JsonProperty("game_mode_mmr_id")
private Integer gameModeMmrID;
@JsonProperty("match_retry_count")
private Integer matchRetryCount;
@JsonProperty("mmr_expansion_phase")
private Integer mmrExpansionPhase;
@JsonProperty("team_assignment")
private ETeamAssignmentType teamAssignment;
@JsonProperty("join_in_progress")
private EJoinInProgressType joinInProgress;
@JsonProperty("join_in_max_time_sec")
private Integer joinInMaxTimeSec;
@JsonProperty("entrance_closing_time")
private Integer entranceClosingTime;
}

2
src/main/java/com/caliverse/admin/domain/entity/HISTORYTYPEDETAIL.java
View File

@@ -63,6 +63,8 @@ public enum HISTORYTYPEDETAIL {
NICKNAME_UPDATE("닉네임 수정"),
DATA_INIT_ADD("데이터 초기화 등록"),
SYSTEM_META_MAIL_DELETE("시스템 메타 메일 삭제"),
QUEST_UPDATE("퀘스트 수정"),
QUEST_DELETE("퀘스트 삭제"),
;
private String historyTypeDetail;
HISTORYTYPEDETAIL(String type) {

11
src/main/java/com/caliverse/admin/domain/entity/STATUSTYPE.java Normal file
View File

@@ -0,0 +1,11 @@
package com.caliverse.admin.domain.entity;
public enum STATUSTYPE {
WAIT,
FAIL,
SUCCESS,
RUNNING,
FINISH,
COMPLETE
;
}

10
src/main/java/com/caliverse/admin/domain/request/LogGameRequest.java
View File

@@ -2,6 +2,7 @@ package com.caliverse.admin.domain.request;
import com.caliverse.admin.domain.entity.common.SearchUserType;
import com.caliverse.admin.dynamodb.entity.EAmountDeltaType;
import com.caliverse.admin.dynamodb.entity.ECountDeltaType;
import com.caliverse.admin.dynamodb.entity.ECurrencyType;
import com.caliverse.admin.logs.entity.LogAction;
import com.caliverse.admin.logs.entity.LogDomain;
@@ -28,10 +29,19 @@ public class LogGameRequest {
private LogDomain logDomain;
@JsonProperty("tran_id")
private String tranId;
//currency
@JsonProperty("currency_type")
private ECurrencyType currencyType;
@JsonProperty("amount_delta_type")
private EAmountDeltaType amountDeltaType;
//item
@JsonProperty("count_delta_type")
private ECountDeltaType countDeltaType;
@JsonProperty("item_type_large")
private String itemTypeLarge;
@JsonProperty("item_type_small")
private String itemTypeSmall;
@JsonProperty("start_dt")
private LocalDateTime startDt;
@JsonProperty("end_dt")

31
src/main/java/com/caliverse/admin/domain/response/LogResponse.java
View File

@@ -1,6 +1,8 @@
package com.caliverse.admin.domain.response;
import com.caliverse.admin.Indicators.entity.CurrencyDetailLogInfo;
import com.caliverse.admin.Indicators.entity.CurrencyItemLogInfo;
import com.caliverse.admin.Indicators.entity.ItemDetailLogInfo;
import com.caliverse.admin.domain.entity.log.GenericLog;
import com.caliverse.admin.logs.Indicatordomain.GenericMongoLog;
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -39,6 +41,10 @@ public class LogResponse {
private List<currencyLog> currencyList;
@JsonProperty("currency_detail_list")
private List<CurrencyDetailLogInfo> currencyDetailList;
@JsonProperty("item_detail_list")
private List<ItemDetailLogInfo> itemDetailList;
@JsonProperty("currency_item_list")
private List<CurrencyItemLogInfo> currencyItemList;
private int total;
@JsonProperty("total_all")
@@ -72,4 +78,29 @@ public class LogResponse {
private Integer totalCurrencies;
}
@Data
@Builder
public static class itemLog {
private String logDay;
private String accountId;
private String userGuid;
private String userNickname;
private Double sapphireAcquired;
private Double sapphireConsumed;
private Double sapphireNet;
private Double goldAcquired;
private Double goldConsumed;
private Double goldNet;
private Double caliumAcquired;
private Double caliumConsumed;
private Double caliumNet;
private Double beamAcquired;
private Double beamConsumed;
private Double beamNet;
private Double rubyAcquired;
private Double rubyConsumed;
private Double rubyNet;
private Integer totalCurrencies;
}
}

10
src/main/java/com/caliverse/admin/domain/response/UsersResponse.java
View File

@@ -129,13 +129,13 @@ public class UsersResponse {
@JsonProperty("character_id")
private String characterId;
//기본 외형
private String basicstyle;
private Integer basicstyle;
//체형 타입
private String bodyshape;
private Integer bodyshape;
//헤어스타일
private String hairstyle;
private Integer hairstyle;
//얼굴 커스터마이징
private int[] facesCustomizing;
private List<Integer> facesCustomizing;
}
@Data
@@ -319,7 +319,7 @@ public class UsersResponse {
private String type;
@JsonProperty("current_task_num")
private Integer currentTaskNum;
private String status;
private Integer status;
private List<Quest> detailQuest;
}
@Data