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

전투 이벤트 등록 예외 추가

Browse Source 
이용자 제재 엑셀 체크 수정
This commit is contained in:
bcjang
2025-05-12 10:41:25 +09:00
parent 0cd0853a63
commit b38eb0c5b1
8 changed files with 124 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/caliverse/admin/domain/service/BattleEventService.java
View File

@@ -130,6 +130,18 @@ public class BattleEventService {
}
battleEventRequest.setInstanceId(CommonConstants.BATTLE_INSTANCE_ID); //고정값으로 넣고 추후 맵정보가 늘어나면 선택하는 걸로
if(battleEventRequest.getRoundTime().equals(0)
|| battleEventRequest.getHotTime().equals(0)
|| battleEventRequest.getConfigId().equals(0)
|| battleEventRequest.getRoundCount().equals(0)
|| battleEventRequest.getRewardGroupId().equals(0)
){
return BattleEventResponse.builder()
.status(CommonCode.ERROR.getHttpStatus())
.result(ErrorCode.ERROR_BATTLE_EVENT_TIME_OVER.toString())
.build();
}
int operation_time = calcEndTime(battleEventRequest);
battleEventRequest.setEventOperationTime(operation_time);

41
src/main/java/com/caliverse/admin/domain/service/BlackListService.java
View File

@@ -3,6 +3,7 @@ package com.caliverse.admin.domain.service;
import com.caliverse.admin.domain.dao.admin.BlackListMapper;
import com.caliverse.admin.domain.dao.admin.HistoryMapper;
import com.caliverse.admin.domain.entity.BlackList;
import com.caliverse.admin.domain.entity.Excel;
import com.caliverse.admin.domain.entity.HISTORYTYPE;
import com.caliverse.admin.domain.request.BlackListRequest;
import com.caliverse.admin.domain.response.BlackListResponse;
@@ -10,6 +11,7 @@ import com.caliverse.admin.dynamodb.service.DynamodbUserService;
import com.caliverse.admin.global.common.code.CommonCode;
import com.caliverse.admin.global.common.code.ErrorCode;
import com.caliverse.admin.global.common.code.SuccessCode;
import com.caliverse.admin.global.common.constants.CommonConstants;
import com.caliverse.admin.global.common.exception.RestApiException;
import com.caliverse.admin.global.common.utils.CommonUtils;
import com.caliverse.admin.global.common.utils.ExcelUtils;
@@ -85,10 +87,10 @@ public class BlackListService {
throw new RestApiException(CommonCode.ERROR.getHttpStatus(), ErrorCode.NOT_EXIT_EXCEL.getMessage() );
}
List<String> listData = excelUtils.getListData(file, 1, 0);
List<Excel> listData = excelUtils.getListData(file);
// 엑셀 파일내 중복된 데이터 있는지 체크
if(excelUtils.hasDuplicates(listData)){
if(excelUtils.hasDuplicatesExcel(listData)){
//중복된 유저 정보가 있습니다.
throw new RestApiException(CommonCode.ERROR.getHttpStatus(), ErrorCode.DUPLICATE_EXCEL.getMessage() );
}
@@ -96,28 +98,27 @@ public class BlackListService {
listData.forEach(item->{
BlackList blackList = new BlackList();
blackList.setGuid(item);
//gameDB에서 닉네임, isWhiteUser, isBlackUser 조회
String nickName = dynamodbUserService.getGuidByName(item);
if(nickName != ""){
String user = item.getUser();
boolean isGuid = true;
if(item.getType().equals(CommonConstants.NICKNAME)){
blackList.setNickname(user);
String guid = dynamodbUserService.getNameByGuid(user);
if(guid == null || guid.isEmpty()) isGuid = false;
blackList.setGuid(guid);
}else{
isGuid = dynamodbUserService.isUser(user);
blackList.setGuid(user);
String nickName = dynamodbUserService.getGuidByName(user);
blackList.setNickname(nickName);
}
//adminDB 에 데이터 있는지 체크
int cnt = blackListMapper.getCountByGuid(item);
//gameDB isWhiteUser 값 체크
// boolean isBlackUser = dynamoDBService.isWhiteOrBlackUser(item);
boolean isBlackUser = dynamodbUserService.isBlockUser(item);
boolean isGuid = dynamoDBService.isGuidChecked(item);
int cnt = blackListMapper.getCountByGuid(blackList.getGuid());
boolean isBlackUser = dynamodbUserService.isBlockUser(blackList.getGuid());
// //guid 검증
// if(blackAttr.size() == 0){
// throw new RestApiException(CommonCode.ERROR.getHttpStatus(), ErrorCode.GUID_CHECK.getMessage());
// }
//
// boolean isBlackUser = dynamoDBService.isWhiteOrBlackUser(blackAttr.get("isBlackUser"));
if(cnt == 0){
if(isBlackUser || isGuid){
if(isBlackUser || !isGuid){
blackList.setValidate(false);
}else{
blackList.setValidate(true);
@@ -160,7 +161,7 @@ public class BlackListService {
if(dynamoDBService.isGuidChecked(guid)){
throw new RestApiException(CommonCode.ERROR.getHttpStatus(), ErrorCode.WARNING_GUID_CHECK.toString());
}
// boolean isBlackUser = dynamoDBService.isWhiteOrBlackUser(guid);
boolean isBlackUser = dynamodbUserService.isBlockUser(guid);
if(isBlackUser){
throw new RestApiException(CommonCode.ERROR.getHttpStatus(), ErrorCode.USER_BLOCK_REGIST_DUPLE_WARNING.toString());
@@ -185,7 +186,7 @@ public class BlackListService {
if(dynamoDBService.isGuidChecked(item.getGuid())){
throw new RestApiException(CommonCode.ERROR.getHttpStatus(), ErrorCode.WARNING_GUID_CHECK.toString());
}
// boolean isBlackUser = dynamoDBService.isWhiteOrBlackUser(item.getGuid());
boolean isBlackUser = dynamodbUserService.isBlockUser(item.getGuid());
if(isBlackUser){
throw new RestApiException(CommonCode.ERROR.getHttpStatus(), ErrorCode.USER_BLOCK_REGIST_DUPLE_WARNING.toString());