어드민 수정건 수정

This commit is contained in:
USER
2022-07-11 11:43:43 +09:00
parent fb40f49f09
commit 74511fb587
47 changed files with 887 additions and 384 deletions

View File

@@ -1,14 +1,15 @@
package kr.co.uplus.ez;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Component
public class Scheduler {
private static final Logger log = LoggerFactory.getLogger(Scheduler.class);
/**
* 스케줄러 트리거는 해당영역에 선언 / 서비스영역은 별도
*/

View File

@@ -795,7 +795,7 @@ public class CustMgtService {
paramMap.put("userId", updateAdminInfoTotalReqDto.getUserId());
// 3-1. 기존 정액한도금액 조회
rstAmtMap = custMgtMapper.selectAdminSendingLimt(paramMap);
if(rstAmtMap.get("fxLmtAmt") != null) {
if(rstAmtMap != null) {
String stFxLmtAmt = rstAmtMap.get("fxLmtAmt").toString();
BigDecimal fxLmtAmt = new BigDecimal(stFxLmtAmt);

View File

@@ -36,6 +36,9 @@ public class LoginService {
@Value("#{'${authentication.without.id}'.split(',')}")
private List<String> authenticationWithoutId;
@Value("${sendMsg.tableNm}")
private String sendMsgTableName;
/**
* 1차 로그인 인증
*
@@ -154,7 +157,7 @@ public class LoginService {
sendMsgDto.setClientKey(clientKey);
sendMsgDto.setMsg("인증 번호는 [" + authNum + "] 입니다.");
sendMsgDto.setPhone(user.getHpNo());
sendMsgDto.setTableName(sendMsgTableName);
loginMapper.insertSendMsg(sendMsgDto);
return new AuthNumResDto();
@@ -254,7 +257,7 @@ public class LoginService {
sendMsgDto.setClientKey(clientKey);
sendMsgDto.setMsg("[U+메시지허브이지] \n임시 비밀번호 안내 : " + randomPw + "\n로그인 후, 비밀번호 변경해주세요.\n");
sendMsgDto.setPhone(user.getHpNo());
sendMsgDto.setTableName(sendMsgTableName);
loginMapper.insertSendMsg(sendMsgDto);
return new ResetPasswordResDto();

View File

@@ -9,4 +9,5 @@ public class SendMsgDto {
private String clientKey; // 클라이언트키
private String msg; // 발송 메시지
private String phone; // 수신번호
private String tableName;
}

View File

@@ -22,7 +22,6 @@ public class SendListReqDto implements Serializable {
@ApiModelProperty(example = "발송일", name = "발송일",dataType = "String")
private String sentDate;
@NotNull
@ApiModelProperty(example = "요청채널", name = "요청채널", dataType = "String")
private String reqChennel;

View File

@@ -15,12 +15,16 @@ public class SendNumIntrcpList implements Serializable {
private String blcksndrno;
@ApiModelProperty(example = "발송타입", name = "발송타입", dataType = "String")
private String sndblckTpCd;
@ApiModelProperty(example = "발송타입명", name = "발송타입명", dataType = "String")
private String sndblckTpNm;
@ApiModelProperty(example = "차단여부", name = "차단여부", dataType = "String")
private String blckYn;
@ApiModelProperty(example = "마지막 수정일", name = "마지막 수정일", dataType = "String")
private String lastChgDt;
@ApiModelProperty(example = "차단사유", name = "차단사유", dataType = "String")
@ApiModelProperty(example = "차단사유타입", name = "차단사유타입", dataType = "String")
private String blckRsnCd;
@ApiModelProperty(example = "차단사유명", name = "차단사유명", dataType = "String")
private String blckRsnNm;
@ApiModelProperty(example = "등록자", name = "등록자", dataType = "String")
private String regId;
}

View File

@@ -24,7 +24,8 @@ public class WebInsertIntrcpReqDto implements Serializable {
private String searchType1;
@ApiModelProperty(example = "검색어 (입력항목)", name = "검색어 (입력항목)", dataType = "String")
private String searchText1;
@ApiModelProperty(example = "검색어 (입력항목)", name = "검색어 (입력항목)", dataType = "String")
private String searchType3;
@NotNull
@ApiModelProperty(example = "페이지당 조회할 목록 수", name = "페이지당 조회할 목록 수", dataType = "String")
private int pagePerRows;

View File

@@ -27,4 +27,6 @@ public class WebIntrcpList implements Serializable {
private String blckRsnCd;
@ApiModelProperty(example = "발송일자", name = "발송일자", dataType = "String")
private String blckDt;
@ApiModelProperty(example = "서비스ID", name = "서비스ID", dataType = "String")
private String serviceId;
}

View File

@@ -10,7 +10,7 @@ import java.io.Serializable;
public class ZezNumIntrcpList implements Serializable {
@ApiModelProperty(example = "리스트 번호", name = "리스트 번호", dataType = "String")
private String no;
private int no;
@ApiModelProperty(example = "고객사", name = "고객사", dataType = "String")
private String custNm;
@ApiModelProperty(example = "사업자번호", name = "사업자번호", dataType = "String")

View File

@@ -1,17 +1,15 @@
package kr.co.uplus.ez.api.sendNumMgt.dto;
import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@SuppressWarnings("serial")
@Data
public class DeleteNumber implements Serializable{
@ApiModelProperty(example = "등록번호", name = "등록번호", dataType = "String")
private String regNo;
private String regReqNo;
@ApiModelProperty(example = "관리자 ID", name = "관리자 ID", dataType = "String")
private String adminId;
}

View File

@@ -1,16 +1,14 @@
package kr.co.uplus.ez.api.sendNumMgt.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@SuppressWarnings("serial")
@Data
public class DeleteNumberReqDto implements Serializable{
@ApiModelProperty(example = "등록번호 리스트", name = "등록번호 리스트", dataType = "String")
private List<DeleteNumber> list;
}

View File

@@ -37,7 +37,6 @@ authentication:
without:
id: superadminuser,jambler01,jambler02,jambler03,jambler04,jambler05,jambler06
mail:
from: msghubez@lguplus.co.kr
templeteCode: E0005
@@ -48,7 +47,7 @@ msghubez:
applicationId: EZ_ADMIN
uri:
sendTemplateMail: /api/v1/fo/sendTemplateMail
testId:
prodCd: LPZ0045389
rpsnBday: 19800101
@@ -64,4 +63,7 @@ testId:
file-resource:
info:
sendNumber:
path: /efs/admin/sendNumber/
path: /efs/admin/sendNumber/
sendMsg:
tableNm: EZ_MSG_NORMAL

View File

@@ -35,15 +35,15 @@ schedule:
# 2차인증 제외 ID목록.
authentication:
without:
id: jambler01,jambler02,jambler03,jambler04,jambler05,jambler06
id: jambler01,jambler02,jambler03,jambler04,jambler05,jambler06,superadminuser
mail:
from: msghubez@lguplus.co.kr
templeteCode: E0005
msghubez:
homepage-url: https://mhez-dev.uplus.co.kr
api-url: https://localhost:7071
hmoepage-url: https://mhez-dev.uplus.co.kr
api-url: https://api-int.mhez-dev.uplus.co.kr
applicationId: EZ_ADMIN
uri:
sendTemplateMail: /api/v1/fo/sendTemplateMail
@@ -63,4 +63,7 @@ testId:
file-resource:
info:
sendNumber:
path: /efs/admin/sendNumber/
path: /efs/admin/sendNumber/
sendMsg:
tableNm: EZ_MSG_NORMAL

View File

@@ -63,4 +63,7 @@ testId:
file-resource:
info:
sendNumber:
path: /efs/admin/sendNumber/
path: /efs/admin/sendNumber/
sendMsg:
tableNm: EZ_MSG_NORMAL

View File

@@ -47,7 +47,7 @@ msghubez:
applicationId: EZ_ADMIN
uri:
sendTemplateMail: /api/v1/fo/sendTemplateMail
testId:
prodCd: LPZ0045389
rpsnBday: 19800101
@@ -63,4 +63,7 @@ testId:
file-resource:
info:
sendNumber:
path: /efs/admin/sendNumber/
path: /efs/admin/sendNumber/
sendMsg:
tableNm: EZ_MSG_NORMAL