jbcheong/hubez-admin
1
0
Fork 0
mirror of http://git.mhez-qa.uplus.co.kr/hubez/hubez-admin.git synced 2025-12-07 02:32:20 +09:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
kimre
2022-07-12 22:22:17 +09:00
parent 3d7032432c
commit c64cf89919
32 changed files with 787 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
/** 사용자 유무 확인.*/

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

@@ -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. 기존 정액한도금액 조회

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

@@ -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;
}

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

@@ -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;

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

@@ -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);

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

@@ -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;
}

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

@@ -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;
}

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

@@ -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;
}

21
src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml
View File

@@ -114,10 +114,10 @@
</select>
<sql id="subsListCondition">
<if test="startDt != null and startDt != ''">
AND esi.SUBS_DT <![CDATA[ >= ]]> STR_TO_DATE(REPLACE( #{startDt}, '-', '' ), '%Y%m%d')
AND esi.SUBS_DT <![CDATA[ >= ]]> STR_TO_DATE(concat(REPLACE(#{startDt}, '-', '' ),'000000') , '%Y%m%d%H%i%s')
</if>
<if test="endDt != null and endDt != ''">
AND esi.SUBS_DT <![CDATA[ <= ]]> STR_TO_DATE(REPLACE( #{endDt}, '-', '' ), '%Y%m%d')
AND esi.SUBS_DT <![CDATA[ <= ]]> STR_TO_DATE(concat(REPLACE(#{endDt}, '-', '' ),'235959'), '%Y%m%d%H%i%s')
</if>
<if test="searchType1 != null and searchType1 != ''">
AND esu.USER_STTUS_CD = #{searchType1}
@@ -432,10 +432,10 @@
<sql id="svcUserListCondition">
<if test="startDt != null and startDt != ''">
AND esu.REG_DT <![CDATA[ >= ]]> STR_TO_DATE(REPLACE( #{startDt}, '-', '' ), '%Y%m%d')
AND esu.REG_DT <![CDATA[ >= ]]> STR_TO_DATE(concat(REPLACE(#{startDt}, '-', '' ),'000000') , '%Y%m%d%H%i%s')
</if>
<if test="endDt != null and endDt != ''">
AND esu.REG_DT <![CDATA[ <= ]]> STR_TO_DATE(REPLACE( #{endDt}, '-', '' ), '%Y%m%d')
AND esu.REG_DT <![CDATA[ <= ]]> STR_TO_DATE(concat(REPLACE(#{endDt}, '-', '' ),'235959'), '%Y%m%d%H%i%s')
</if>
<if test="searchType1 != null and searchType1 != ''">
AND esu.USER_STTUS_CD = #{searchType1}
@@ -539,6 +539,18 @@
( SELECT @ROWNUM := 0 ) AS R
</select>
<select id="selectMemoListTotalCnt" parameterType="kr.co.uplus.ez.api.custMgt.dto.AllMemoListReqDto" resultType="int">
/* custMgt-mapper.xml(selectMemoList) */
SELECT
COUNT(*)
FROM
hubez_common.EZ_USER_MEMO EUM
INNER JOIN hubez_common.EZ_SVC_USER ESU
ON EUM.USER_SEQ = ESU.USER_SEQ
WHERE
ESU.USER_ID = #{userId}
</select>
<select id="selectMemoList" parameterType="kr.co.uplus.ez.api.custMgt.dto.AllMemoListReqDto" resultType="kr.co.uplus.ez.api.custMgt.dto.AllMemoList">
/* custMgt-mapper.xml(selectMemoList) */
SELECT
@@ -553,6 +565,7 @@
WHERE
ESU.USER_ID = #{userId}
ORDER BY EUM.REG_DT DESC
LIMIT #{page}, #{pagePerRows}
</select>
<select id="selectCustInfoCount" parameterType="String" resultType="int">

40
src/main/resources/mapper/mysql/sendNumMgt/sendNumMgt-mapper.xml
View File

@@ -100,6 +100,9 @@
INNER JOIN hubez_common.EZ_SNDRNO_REG esr
ON
esr.USER_SEQ = esu.USER_SEQ
INNER JOIN hubez_common.EZ_SVC_SNDRNO ess
ON
esr.REG_REQ_NO = ess.REG_REQ_NO
WHERE 1=1
<include refid="numberListCondition"></include>
</select>
@@ -118,30 +121,29 @@
(SELECT esu2.USER_ID FROM hubez_common.EZ_SVC_USER esu2 WHERE esu2.USER_SEQ = esu.PRNTS_USER_SEQ)AS ADMIN_ID,
esr.REG_ID AS register,
eci.BIZRNO AS bRegNo,
(SELECT (
SELECT
(SELECT
ecd.DTL_CD_NM
FROM
hubez_common.EZ_CD_DTL ecd
WHERE
ecd.GRP_CD = 'NMINEE_DIV_CD'
AND ecd.DTL_CD = ess.NMINEE_DIV_CD) FROM hubez_common.EZ_SVC_SNDRNO ess WHERE ess.REG_REQ_NO = esr.REG_REQ_NO LIMIT 1) AS NMINEE_DIV_CD,
(SELECT (SELECT
AND ecd.DTL_CD = ess.NMINEE_DIV_CD) AS NMINEE_DIV_CD,
(SELECT
ecd.DTL_CD_NM
FROM
hubez_common.EZ_CD_DTL ecd
WHERE
ecd.GRP_CD = 'INCH_DIV_CD'
AND ecd.DTL_CD = ess.INCH_DIV_CD) FROM hubez_common.EZ_SVC_SNDRNO ess WHERE ess.REG_REQ_NO = esr.REG_REQ_NO LIMIT 1) AS INCH_DIV_CD,
(
SELECT
AND ecd.DTL_CD = ess.INCH_DIV_CD) AS INCH_DIV_CD,
(SELECT
ecd.DTL_CD_NM
FROM
hubez_common.EZ_CD_DTL ecd
WHERE
ecd.GRP_CD = 'SNDRNO_REQ_STTUS_CD'
AND ecd.DTL_CD = esr.REQ_STTUS_CD) AS sttusCd,
(SELECT ess.SNDRNO FROM hubez_common.EZ_SVC_SNDRNO ess WHERE ess.REG_REQ_NO = esr.REG_REQ_NO LIMIT 1) AS SNDRNO,
ess.SNDRNO AS SNDRNO,
ess.SEQ_NO,
DATE_FORMAT(esr.REG_DT, '%Y-%m-%d') AS REG_DT
FROM
hubez_common.EZ_CUST_INFO eci
@@ -151,6 +153,9 @@
INNER JOIN hubez_common.EZ_SNDRNO_REG esr
ON
esr.USER_SEQ = esu.USER_SEQ
INNER JOIN hubez_common.EZ_SVC_SNDRNO ess
ON
esr.REG_REQ_NO = ess.REG_REQ_NO
WHERE 1=1
<include refid="numberListCondition"></include>
ORDER BY eci.BIZRNO
@@ -228,20 +233,12 @@
/* sendNumMgt-mapper.xml(deleteNumber) */
DELETE
FROM
esr
, esd
USING hubez_common.EZ_SNDRNO_REG AS esr
INNER JOIN hubez_common.EZ_SNDRNO_DOC AS esd
ON
esr.REG_REQ_NO = esd.REG_REQ_NO
INNER JOIN hubez_common.EZ_SVC_SNDRNO AS ess
ON
esr.REG_REQ_NO = ess.REG_REQ_NO
hubez_common.EZ_SVC_SNDRNO
<where>
esr.REG_REQ_NO IN
SEQ_NO IN
<foreach collection="list" item="item" index="i" open="("
separator="," close=")">
#{item.regReqNo}
#{item.seqNo}
</foreach>
</where>
</delete>
@@ -451,10 +448,9 @@
esu.USER_SEQ = esr.USER_SEQ
INNER JOIN hubez_common.EZ_SVC_SNDRNO ess
ON
eci.CUST_SEQ = ess.CUST_SEQ
esr.REG_REQ_NO = ess.REG_REQ_NO
WHERE 1 = 1
AND ess.SNDRNO = #{sndrno}
AND esr.REG_REQ_NO = #{regReqNo}
AND ess.SEQ_NO = #{seqNo}
</select>
<select id="selectAuthFileList" parameterType="kr.co.uplus.ez.api.sendNumMgt.dto.DetailNumberReqDto" resultType="kr.co.uplus.ez.api.sendNumMgt.dto.AuthFileInfo">