로그인 / 고객관리 / 시스템관리 ... 디자인 및 기능 수정 적용

src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtMapper.java

@@ -34,6 +34,8 @@ public interface CustMgtMapper {
 	int selectMemberDetailListTotalCnt(MemberAdminDetailReqDto memberDetailListReqDto);
 	/** 사용자 아이디 목록 조회.*/
 	List<MemberDetail> selectMemberDetailList(MemberAdminDetailReqDto memberDetailListReqDto);
+
+	int selectMemoListTotalCnt(AllMemoListReqDto allMemoListReqDto);
 	/** 사용자 메모 목록 조회.*/
 	List<AllMemoList> selectMemoList(AllMemoListReqDto allMemoListReqDto);
 	/** 사용자 유무 확인.*/

src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java

@@ -5,6 +5,7 @@ import kr.co.uplus.ez.common.components.HubeasyApiComponents;
 import kr.co.uplus.ez.common.data.*;
 import kr.co.uplus.ez.common.utils.EncryptionUtil;
 import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -452,14 +453,38 @@ public class CustMgtService {
 
 		CustMgtMapper custMgtMapper = sqlSessionSlave.getMapper(CustMgtMapper.class);
 
-		List<AllMemoList> allMemoLists = custMgtMapper.selectMemoList(allMemoListReqDto);
+		String nowPage = String.valueOf(allMemoListReqDto.getPage());
+		int totalCnt = custMgtMapper.selectMemoListTotalCnt(allMemoListReqDto);
 
-		// 조회 결과 없음.
-		if (allMemoLists == null) {
-			return new AllMemoListResDto(ApiResponseCode.CM_NOT_FOUND);
+		if (totalCnt == 0) {
+
+			AllMemoListRes allMemoListRes = new AllMemoListRes();
+			allMemoListRes.setList(new ArrayList<>());
+
+			Paging paging = new Paging();
+			paging.setPage(nowPage);
+			paging.setTotalCnt(String.valueOf(totalCnt));
+			allMemoListRes.setPaging(paging);
+
+			return new AllMemoListResDto(ApiResponseCode.CM_NOT_FOUND, allMemoListRes);
 		}
 
-		return new AllMemoListResDto(new AllMemoListRes(allMemoLists));
+		int page = allMemoListReqDto.getPage();
+		int pagePerRows = allMemoListReqDto.getPagePerRows();
+		page = (page - 1) * pagePerRows;
+		allMemoListReqDto.setPage(page);
+
+		List<AllMemoList> allMemoLists = custMgtMapper.selectMemoList(allMemoListReqDto);
+
+		AllMemoListRes allMemoListRes = new AllMemoListRes();
+		allMemoListRes.setList(allMemoLists);
+
+		Paging paging = new Paging();
+		paging.setPage(nowPage);
+		paging.setTotalCnt(String.valueOf(totalCnt));
+		allMemoListRes.setPaging(paging);
+
+		return new AllMemoListResDto(ApiResponseCode.SUCCESS, allMemoListRes);
 	}
 
 	/**
@@ -788,7 +813,7 @@ public class CustMgtService {
 
 			// 3. 발송 한도 update
 			if(updateAdminInfoTotalReqDto.getSendingLimit() != null) {
-				BigDecimal sendingLimitAmt = new BigDecimal(updateAdminInfoTotalReqDto.getSendingLimit());
+				BigDecimal sendingLimitAmt = new BigDecimal(StringUtils.remove(updateAdminInfoTotalReqDto.getSendingLimit(), ","));
 
 				paramMap.put("userId", updateAdminInfoTotalReqDto.getUserId());
 				// 3-1. 기존 정액한도금액 조회

src/main/java/kr/co/uplus/ez/api/custMgt/dto/AllMemoListReqDto.java

@@ -1,12 +1,11 @@
 package kr.co.uplus.ez.api.custMgt.dto;
 
-import java.io.Serializable;
-
-import javax.validation.constraints.NotNull;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
 @SuppressWarnings("serial")
 @Data
 public class AllMemoListReqDto implements Serializable {
@@ -15,4 +14,11 @@ public class AllMemoListReqDto implements Serializable {
 	@ApiModelProperty(example = "사용자 ID", name = "사용자 ID", dataType = "String")
 	private String userId;
 
+	@NotNull
+	@ApiModelProperty(example = "페이지당 조회할 목록 수",notes = "페이지당 조회할 목록 수", name = "페이지당 조회할 목록 수", dataType = "int")
+	private int pagePerRows;
+
+	@NotNull
+	@ApiModelProperty(example = "현재 페이지", name = "현재 페이지", dataType = "int")
+	private int page;
 }

src/main/java/kr/co/uplus/ez/api/custMgt/dto/AllMemoListRes.java

@@ -1,16 +1,22 @@
 package kr.co.uplus.ez.api.custMgt.dto;
 
+import kr.co.uplus.ez.common.data.Paging;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.List;
 
-import lombok.Data;
-
 @SuppressWarnings("serial")
 @Data
 public class AllMemoListRes implements Serializable{
 
+	private Paging paging;
 	private List<AllMemoList> list;
 
+	public AllMemoListRes(){
+		super();
+	}
+
 	public AllMemoListRes(List<AllMemoList> list) {
 		super();
 		this.list = list;

src/main/java/kr/co/uplus/ez/api/login/LoginService.java

@@ -244,6 +244,7 @@ public class LoginService {
 		authUser.setTmpPwdYn(Const.COMM_YES);
 		authUser.setPwd(EncryptionUtil.getCustomSHA512(resetPasswordReqDto.getUserId(),  randomPw));
 		authUser.setPwdChgDt(Const.COMM_YES);
+		authUser.setAuthchrFailCnt(0);
 
 		int reslut = loginMapper.updateAdmUser(authUser);
 
@@ -294,6 +295,7 @@ public class LoginService {
 		authUser.setOprtrId(updatePasswordReqDto.getUserId());
 		authUser.setPwd(newPw);
 		authUser.setPwdChgDt(Const.COMM_YES);
+		authUser.setAuthchrFailCnt(0);
 
 		int reslut = loginMapper.updateAdmUser(authUser);
 

src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DeleteNumber.java

@@ -9,7 +9,9 @@ import java.io.Serializable;
 @Data
 public class DeleteNumber implements Serializable{
 
-	@ApiModelProperty(example = "등록번호", name = "등록번호", dataType = "String")
-	private String regReqNo;
+//	@ApiModelProperty(example = "등록번호", name = "등록번호", dataType = "String")
+//	private String regReqNo;
+	@ApiModelProperty(example = "발신일련번호", name = "발신일련번호", dataType = "String")
+	private String seqNo;
 
 }

src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/DetailNumberReqDto.java

@@ -15,4 +15,7 @@ public class DetailNumberReqDto implements Serializable{
 	@ApiModelProperty(example = "발신번호", name = "발신번호", dataType = "String")
 	private String sndrno;
 
+	@ApiModelProperty(example = "발신일련번호", name = "발신일련번호", dataType = "String")
+	private String seqNo;
+
 }

src/main/java/kr/co/uplus/ez/api/sendNumMgt/dto/SendNumberInfo.java

@@ -33,5 +33,7 @@ public class SendNumberInfo  implements Serializable{
 	private String regDt;
 	@ApiModelProperty(example = "발신번호등록번호", name = "발신번호등록번호", dataType = "String")
 	private String regReqNo;
+	@ApiModelProperty(example = "발신일련번호", name = "발신일련번호", dataType = "String")
+	private String seqNo;
 
 }