TC 수정 반영

src/main/java/kr/co/uplus/ez/api/riskMgt/RiskMgtService.java

@@ -106,6 +106,11 @@ public class RiskMgtService {
 
 		RiskMgtMapper riskMgtMapper = sqlSessionMaster.getMapper(RiskMgtMapper.class);
 
+		SendNumIntrcpDetail sendNumIntrcpDetail = riskMgtMapper.selectSndrnoBlckDetail(insertIntrcpReqDto.getBlckSndrno());
+		if(sendNumIntrcpDetail != null){
+			return new SendNumInsertIntrcpResDto(ApiResponseCode.CE_DUPLICATE_ID);
+		}
+
 		try {
 			insertIntrcpReqDto.setBlckYn(Const.COMM_YES);
 			// regId 들고오기

src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java

@@ -12,13 +12,17 @@ import org.mybatis.spring.SqlSessionTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class SendNumMgtService {
@@ -46,28 +50,30 @@ public class SendNumMgtService {
 		int totalCnt = sendNumMgtMapper.selectProfileTotalCnt(profileListReqDto);
 
 		if(totalCnt == 0) {
+			ProfileListRes profileListRes = new ProfileListRes();
+			profileListRes.setList(new ArrayList<>());
+
 			Paging paging = new Paging();
 			paging.setPage(nowPage);
 			paging.setTotalCnt(String.valueOf(totalCnt));
-			ProfileListRes profileListRes = new ProfileListRes();
-			profileListRes.setList(new ArrayList<>());
 			profileListRes.setPaging(paging);
+
 			return new ProfileListResDto(ApiResponseCode.CM_NOT_FOUND, profileListRes);
 		}
 
 		int page = profileListReqDto.getPage();
-		int pagePerRows = profileListReqDto.getPage();
+		int pagePerRows = profileListReqDto.getPagePerRows();
 		page = (page - 1) * pagePerRows;
 		profileListReqDto.setPage(page);
 
 		List<ProfileInfo> profileInfos = sendNumMgtMapper.selectProfileList(profileListReqDto);
 
+		ProfileListRes profileListRes = new ProfileListRes();
+		profileListRes.setList(profileInfos);
+
 		Paging paging = new Paging();
 		paging.setPage(nowPage);
 		paging.setTotalCnt(String.valueOf(totalCnt));
-
-		ProfileListRes profileListRes = new ProfileListRes();
-		profileListRes.setList(profileInfos);
 		profileListRes.setPaging(paging);
 
 		return new ProfileListResDto(ApiResponseCode.SUCCESS, profileListRes);
@@ -88,28 +94,30 @@ public class SendNumMgtService {
 		int totalCnt = sendNumMgtMapper.selectSendNumberTotalCnt(sendNumberListReqDto);
 
 		if(totalCnt == 0) {
+
+			SendNumberListRes sendNumberListRes = new SendNumberListRes();
+			sendNumberListRes.setList(new ArrayList<>());
+
 			Paging paging = new Paging();
 			paging.setPage(nowPage);
 			paging.setTotalCnt(String.valueOf(totalCnt));
-			SendNumberListRes sendNumberListRes = new SendNumberListRes();
-			sendNumberListRes.setList(new ArrayList<>());
 			sendNumberListRes.setPaging(paging);
 			return new SendNumberListResDto(ApiResponseCode.CM_NOT_FOUND, sendNumberListRes);
 		}
 
 		int page = sendNumberListReqDto.getPage();
-		int pagePerRows = sendNumberListReqDto.getPage();
+		int pagePerRows = sendNumberListReqDto.getPagePerRows();
 		page = (page - 1) * pagePerRows;
 		sendNumberListReqDto.setPage(page);
 
 		List<SendNumberInfo> sendNumberInfos = sendNumMgtMapper.selectSendNumberList(sendNumberListReqDto);
 
+		SendNumberListRes sendNumberListRes = new SendNumberListRes();
+		sendNumberListRes.setList(sendNumberInfos);
+
 		Paging paging = new Paging();
 		paging.setPage(nowPage);
 		paging.setTotalCnt(String.valueOf(totalCnt));
-
-		SendNumberListRes sendNumberListRes = new SendNumberListRes();
-		sendNumberListRes.setList(sendNumberInfos);
 		sendNumberListRes.setPaging(paging);
 
 		return new SendNumberListResDto(ApiResponseCode.SUCCESS, sendNumberListRes);
@@ -142,32 +150,36 @@ public class SendNumMgtService {
 	 * @param insertNumberReqDto
 	 * @return
 	 */
+	@Transactional(value="db1TransactionManager")
 	public InsertNumberResDto insertNumber(InsertNumberReqDto insertNumberReqDto, MultipartHttpServletRequest multipartRequest) {
 
 		SendNumMgtMapper sendNumMgtMapper = sqlSessionMaster.getMapper(SendNumMgtMapper.class);
 
 		String adminId = insertNumberReqDto.getAdminId();
+		Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+		UserDetails userDetails = (UserDetails) principal;
+		String regId = userDetails.getUsername();
 
 		// 2. 중복 발신번호 체크를 위한 조회.
 		List<InsertNumber> sendNumbers = sendNumMgtMapper.selectSndrnoList(insertNumberReqDto);
-		List<InsertNumber> resSendNumbers = new ArrayList<>();
+		List<InsertNumber> dbSendNumbers = insertNumberReqDto.getList();
+
+		List<InsertNumber> allSendNumbers = insertNumberReqDto.getList();
 
-		if(insertNumberReqDto.getList().size() == sendNumbers.size()){
-			// 중복건... 오류
-		}
 		// 실패 항목 응답.
 		if(sendNumbers.size() > 0){
-			// 중복건의 대한 오류 응답.
-			resSendNumbers.addAll(sendNumbers);
+			allSendNumbers.addAll(sendNumbers);
 		}
 
+		dbSendNumbers = allSendNumbers.stream().distinct().collect(Collectors.toList());
+
 		// 1. 발신번호 SEQ 채번
 		String regReqNo = sendNumMgtMapper.selectRegReqNo();
 		String userSeq = sendNumMgtMapper.selectUserSeqByAdminId(adminId);
 		try {
 			insertNumberReqDto.setUserSeq(userSeq);
 			insertNumberReqDto.setReqCnt(insertNumberReqDto.getList().size());
-			insertNumberReqDto.setRegId(adminId);
+			insertNumberReqDto.setRegId(regId);
 			insertNumberReqDto.setRegReqNo(regReqNo);
 
 			//	2. 발신번호등록 테이블 저장. (EZ_SNDRNO_REG)
@@ -181,18 +193,7 @@ public class SendNumMgtService {
 				dir.mkdirs();
 			}
 
-			// 3. 발신번호 테이블 저장. (EZ_SVC_SNDRNO)
-			List<InsertNumber> reqSendNumbers = insertNumberReqDto.getList();
-			List<InsertNumber> dbSendNumbers = new ArrayList<>();
-			for(InsertNumber insertNumber: reqSendNumbers){
-				for(InsertNumber insertNumber1: resSendNumbers){
-					if(StringUtils.equals(insertNumber.getSendNum(), insertNumber1.getSendNum())){
-						reqSendNumbers.remove(insertNumber1);
-					}
-				}
-			}
-
-			for (InsertNumber dbInsertNumber : reqSendNumbers){
+			for (InsertNumber dbInsertNumber : dbSendNumbers){
 				dbInsertNumber.setCustSeq(insertNumberReqDto.getCustSeq());
 				dbInsertNumber.setRegReqNo(regReqNo);
 				dbInsertNumber.setNmineeDivCd(insertNumberReqDto.getNmineeDivCd());
@@ -202,7 +203,7 @@ public class SendNumMgtService {
 				}else{
 					dbInsertNumber.setNmineeDivCd(insertNumberReqDto.getNmineeDivCd());
 				}
-				dbInsertNumber.setRegId(adminId);
+				dbInsertNumber.setRegId(regId);
 				sendNumMgtMapper.insertNumberList(dbInsertNumber);
 			}
 
@@ -211,7 +212,6 @@ public class SendNumMgtService {
 
 				// 4. 발신번호 등록 서류 테이블 저장. (EZ_SNDRNO_DOC)
 				// DOC_NO 채번.
-				String regId = insertNumberReqDto.getRegId();
 
 				List<MultipartFile> multipartFiles = new ArrayList<>();
 				List<String> docTpCd = new ArrayList<>();
@@ -225,12 +225,13 @@ public class SendNumMgtService {
 				MultipartFile tenureFile = multipartRequest.getFile("tenureFile");
 				multipartFiles.add(tenureFile);
 				docTpCd.add(Const.SNDRNO_DOC_TP_CD_02);
+
 				// 사업자등록증 '06'
 				MultipartFile businessFile = multipartRequest.getFile("businessFile");
 				multipartFiles.add(businessFile);
 				docTpCd.add(Const.SNDRNO_DOC_TP_CD_06);
 
-				if(StringUtils.equals("02", insertNumberReqDto.getNmineeDivCd())){
+				if(StringUtils.equals(Const.SNDRNO_TP_CD_OTHER, insertNumberReqDto.getNmineeDivCd())){
 					// 위임-수임관계 확인 서류 '03'
 					MultipartFile trustFile = multipartRequest.getFile("trustFile");
 					multipartFiles.add(trustFile);
@@ -257,6 +258,8 @@ public class SendNumMgtService {
 					String fileNm = regReqNo + "_" + docTpCd.get(j).substring(1,2) + "_" + docTpCd.get(j) + "." + ext;
 					String titleNm = multipartFiles.get(j).getOriginalFilename();
 					long fileSize = multipartFiles.get(j).getSize();
+
+					// File Upload.
 					FileUtil.upload(multipartFiles.get(j), fileNm, path);
 
 					// 발신번호 등록 서류 테이블 저장 (EZ_SNDRNO_DOC).
@@ -277,9 +280,9 @@ public class SendNumMgtService {
 		}
 
 		InsertNumberRes insertNumberRes = new InsertNumberRes();
-		if(resSendNumbers.size() > 0){
+		if(sendNumbers.size() > 0){
 		// 발신번호 중복건 응답 처리.
-			insertNumberRes.setList(resSendNumbers);
+			insertNumberRes.setList(sendNumbers);
 		}
 
 		return new InsertNumberResDto(ApiResponseCode.SUCCESS, insertNumberRes);
@@ -354,28 +357,30 @@ public class SendNumMgtService {
 		int totalCnt = sendNumMgtMapper.selectSvcSndrnoListTotalCnt(sendNumberApprListReqDto);
 
 		if(totalCnt == 0) {
+			SendNumberApprListRes sendNumberApprListRes = new SendNumberApprListRes();
+			sendNumberApprListRes.setList(new ArrayList<>());
+
 			Paging paging = new Paging();
 			paging.setPage(nowPage);
 			paging.setTotalCnt(String.valueOf(totalCnt));
-			SendNumberApprListRes sendNumberApprListRes = new SendNumberApprListRes();
-			sendNumberApprListRes.setList(new ArrayList<>());
 			sendNumberApprListRes.setPaging(paging);
+
 			return new SendNumberApprListResDto(ApiResponseCode.CM_NOT_FOUND, sendNumberApprListRes);
 		}
 
 		int page = sendNumberApprListReqDto.getPage();
-		int pagePerRows = sendNumberApprListReqDto.getPage();
+		int pagePerRows = sendNumberApprListReqDto.getPagePerRows();
 		page = (page - 1) * pagePerRows;
 		sendNumberApprListReqDto.setPage(page);
 
 		List<SendNumberApprInfo> sendNumberApprInfos = sendNumMgtMapper.selectSvcSndrnoList(sendNumberApprListReqDto);
 
+		SendNumberApprListRes sendNumberApprListRes = new SendNumberApprListRes();
+		sendNumberApprListRes.setList(sendNumberApprInfos);
+
 		Paging paging = new Paging();
 		paging.setPage(nowPage);
 		paging.setTotalCnt(String.valueOf(totalCnt));
-
-		SendNumberApprListRes sendNumberApprListRes = new SendNumberApprListRes();
-		sendNumberApprListRes.setList(sendNumberApprInfos);
 		sendNumberApprListRes.setPaging(paging);
 
 		return new SendNumberApprListResDto(ApiResponseCode.SUCCESS, sendNumberApprListRes);

src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtMapper.java

@@ -1,27 +1,11 @@
 package kr.co.uplus.ez.api.sysMgt;
 
+import kr.co.uplus.ez.api.sysMgt.dto.*;
+import org.apache.ibatis.annotations.Mapper;
+
 import java.util.List;
 import java.util.Map;
 
-import org.apache.ibatis.annotations.Mapper;
-
-import kr.co.uplus.ez.api.sysMgt.dto.AdminDetail;
-import kr.co.uplus.ez.api.sysMgt.dto.AdminDetailReqDto;
-import kr.co.uplus.ez.api.sysMgt.dto.AdminInfo;
-import kr.co.uplus.ez.api.sysMgt.dto.AdminListReqDto;
-import kr.co.uplus.ez.api.sysMgt.dto.AuthDetail;
-import kr.co.uplus.ez.api.sysMgt.dto.AuthDetailReqDto;
-import kr.co.uplus.ez.api.sysMgt.dto.AuthInfo;
-import kr.co.uplus.ez.api.sysMgt.dto.AuthMenu;
-import kr.co.uplus.ez.api.sysMgt.dto.DeleteAdmin;
-import kr.co.uplus.ez.api.sysMgt.dto.DeleteAuthReqDto;
-import kr.co.uplus.ez.api.sysMgt.dto.InsertAdminReqDto;
-import kr.co.uplus.ez.api.sysMgt.dto.InsertAuthReqDto;
-import kr.co.uplus.ez.api.sysMgt.dto.SearchMadangId;
-import kr.co.uplus.ez.api.sysMgt.dto.SearchMadangIdReqDto;
-import kr.co.uplus.ez.api.sysMgt.dto.UpdateAdminReqDto;
-import kr.co.uplus.ez.api.sysMgt.dto.UpdateAuthReqDto;
-
 @Mapper
 public interface SysMgtMapper {
 
@@ -58,4 +42,6 @@ public interface SysMgtMapper {
 	int deleteAuth(Map<String, Object> paramMap); // 권한 삭제
 	
 	int deleteAuthMenu(Map<String, Object> paramMap); // 권한메뉴 삭제
+
+	int checkAdmin(Map<String, Object> paramMap);
 }

src/main/java/kr/co/uplus/ez/api/sysMgt/SysMgtService.java

@@ -108,6 +108,15 @@ public class SysMgtService {
 
 		SysMgtMapper sysMgtMapper = sqlSessionMaster.getMapper(SysMgtMapper.class);
 
+		// 관리자 ID 중복체크.
+		Map<String, Object> paramMap = new HashMap<>();
+		paramMap.put("searchType", "01");
+		paramMap.put("adminId", insertAdminReqDto.getMadangId());
+		int checkId = sysMgtMapper.checkAdmin(paramMap);
+		if(checkId > 0){
+			return new InsertAdminResDto(ApiResponseCode.CE_DUPLICATE_ID);
+		}
+
 		String encPw =  EncryptionUtil.getCustomSHA512(insertAdminReqDto.getMadangId(),  insertAdminReqDto.getAdminPw());
 		insertAdminReqDto.setAdminPw(encPw);
 
@@ -232,9 +241,14 @@ public class SysMgtService {
 	public DeleteAuthResDto deleteAuth(DeleteAuthReqDto deleteAuthReqDto) {
 
 		SysMgtMapper sysMgtMapper = sqlSessionMaster.getMapper(SysMgtMapper.class);
-		Map<String, Object> authParamMap = new HashMap<String, Object>();
 
+		Map<String, Object> authParamMap = new HashMap<String, Object>();
+		authParamMap.put("searchType", "02");
 		authParamMap.put("authCd", deleteAuthReqDto.getAuthCd());
+		int checkAdmin = sysMgtMapper.checkAdmin(authParamMap);
+		if(checkAdmin > 0){
+			return new DeleteAuthResDto(ApiResponseCode.CE_SYSMGT_AUTHCODE_EXISTS_USER);
+		}
 
 		try {
 			// 1.권한메뉴 삭제

src/main/java/kr/co/uplus/ez/common/data/ApiResponseCode.java

@@ -57,7 +57,8 @@ public enum ApiResponseCode {
 	,CE_DUPLICATE_ID("4018", "이미 사용중인 아이디 입니다.")
 	/** 발송한도금액이 정액한도금액보다 작습니다. */
 	,CE_SENDINGLIMT_ERROR("4019", "발송한도금액이 정액한도금액보다 작습니다.")
-
+	/** 해당 권한코드에 해당하는 어드민 사용자가 존재함. */
+	,CE_SYSMGT_AUTHCODE_EXISTS_USER("4020", "해당 권한코드에 해당하는 어드민 사용자가 존재함.")
 	// 시스템
 	/** 알 수 없는 에러. */
 	,SE_UNKNOWN("9999", "알 수 없는 에러");

src/main/java/kr/co/uplus/ez/common/data/Const.java

@@ -95,6 +95,9 @@ public class Const {
 	public static final String SNDRNO_DOC_TP_CD_06 = "06";
 	public static final String SNDRNO_DOC_TP_CD_07 = "07";
 
+	public static final String SNDRNO_TP_CD_SELF = "01";
+	public static final String SNDRNO_TP_CD_OTHER = "02";
+
 	public static final String INCH_DIV_CD_HOME = "01";
 	public static final String INCH_DIV_CD_ADM = "02";