Merge branch 'hylee'
This commit is contained in:
commit
68592e5adc
@ -1,7 +1,7 @@
|
|||||||
package com.itn.mjonApi.cmn.apiServer;
|
package com.itn.mjonApi.cmn.apiServer;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
import com.itn.mjonApi.cmn.msg.MjonResponse;
|
import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonResponseVO;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@ -28,14 +28,14 @@ public class ApiService <T> {
|
|||||||
this.restTemplate = restTemplate;
|
this.restTemplate = restTemplate;
|
||||||
}
|
}
|
||||||
|
|
||||||
public MjonResponse postForEntity(String url, Object request, Class<String> responseType) throws JsonProcessingException {
|
public MjonResponseVO postForEntity(String url, Object request, Class<String> responseType) throws JsonProcessingException {
|
||||||
ResponseEntity<String> spamChkEntity = (ResponseEntity<String>) restTemplate.postForEntity(
|
ResponseEntity<String> spamChkEntity = (ResponseEntity<String>) restTemplate.postForEntity(
|
||||||
url
|
url
|
||||||
, request
|
, request
|
||||||
, responseType
|
, responseType
|
||||||
);
|
);
|
||||||
|
|
||||||
MjonResponse spamResponse = MjonResponse.getMjonResponse(spamChkEntity);
|
MjonResponseVO spamResponse = MjonResponseVO.getMjonResponse(spamChkEntity);
|
||||||
|
|
||||||
|
|
||||||
return spamResponse;
|
return spamResponse;
|
||||||
|
|||||||
@ -2,8 +2,8 @@ package com.itn.mjonApi.cmn.interceptor;
|
|||||||
|
|
||||||
//import java.sql.Date;
|
//import java.sql.Date;
|
||||||
|
|
||||||
import com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO;
|
import com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO;
|
||||||
import com.itn.mjonApi.cmn.idgen.mapper.domain.LettnLoginLogVO;
|
import com.itn.mjonApi.mjon.log.service.mapper.domain.LettnLoginLogVO;
|
||||||
import com.itn.mjonApi.cmn.idgen.service.IdgenService;
|
import com.itn.mjonApi.cmn.idgen.service.IdgenService;
|
||||||
import com.itn.mjonApi.mjon.api.access.service.AccessKeyService;
|
import com.itn.mjonApi.mjon.api.access.service.AccessKeyService;
|
||||||
import com.itn.mjonApi.mjon.log.service.LettnLoginLogService;
|
import com.itn.mjonApi.mjon.log.service.LettnLoginLogService;
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
package com.itn.mjonApi.mjon.api.access.service;
|
package com.itn.mjonApi.mjon.api.access.service;
|
||||||
|
|
||||||
import com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO;
|
import com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO;
|
||||||
import com.itn.mjonApi.cmn.msg.RestResponse;
|
import com.itn.mjonApi.cmn.msg.RestResponse;
|
||||||
|
|
||||||
public interface AccessKeyService {
|
public interface AccessKeyService {
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
package com.itn.mjonApi.mjon.api.access.service;
|
package com.itn.mjonApi.mjon.api.access.service;
|
||||||
|
|
||||||
import com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO;
|
import com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO;
|
||||||
import com.itn.mjonApi.cmn.msg.RestResponse;
|
import com.itn.mjonApi.cmn.msg.RestResponse;
|
||||||
|
|
||||||
public interface AccessTokenService {
|
public interface AccessTokenService {
|
||||||
|
|||||||
@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO;
|
import com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO;
|
||||||
import com.itn.mjonApi.cmn.msg.RestResponse;
|
import com.itn.mjonApi.cmn.msg.RestResponse;
|
||||||
import com.itn.mjonApi.mjon.api.access.service.AccessKeyService;
|
import com.itn.mjonApi.mjon.api.access.service.AccessKeyService;
|
||||||
import com.itn.mjonApi.mjon.api.access.service.mapper.AccessKeyMapper;
|
import com.itn.mjonApi.mjon.api.access.service.mapper.AccessKeyMapper;
|
||||||
|
|||||||
@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO;
|
import com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO;
|
||||||
import com.itn.mjonApi.cmn.idgen.mapper.domain.IdgenVO;
|
import com.itn.mjonApi.cmn.idgen.mapper.domain.IdgenVO;
|
||||||
import com.itn.mjonApi.cmn.msg.RestResponse;
|
import com.itn.mjonApi.cmn.msg.RestResponse;
|
||||||
import com.itn.mjonApi.mjon.api.access.service.AccessTokenService;
|
import com.itn.mjonApi.mjon.api.access.service.AccessTokenService;
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
package com.itn.mjonApi.mjon.api.access.service.mapper;
|
package com.itn.mjonApi.mjon.api.access.service.mapper;
|
||||||
|
|
||||||
import com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO;
|
import com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
package com.itn.mjonApi.mjon.api.access.service.mapper;
|
package com.itn.mjonApi.mjon.api.access.service.mapper;
|
||||||
|
|
||||||
import com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO;
|
import com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO;
|
||||||
import com.itn.mjonApi.cmn.idgen.mapper.domain.IdgenVO;
|
import com.itn.mjonApi.cmn.idgen.mapper.domain.IdgenVO;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
package com.itn.mjonApi.cmn.idgen.mapper.domain;
|
package com.itn.mjonApi.mjon.api.access.service.mapper.domain;
|
||||||
/*
|
/*
|
||||||
table : mj_mymsg
|
table : mj_mymsg
|
||||||
comment : '내문자 보관함';
|
comment : '내문자 보관함';
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.itn.mjonApi.cmn.idgen.mapper.domain;
|
package com.itn.mjonApi.mjon.api.access.service.mapper.domain;
|
||||||
/*
|
/*
|
||||||
table : mj_mymsg
|
table : mj_mymsg
|
||||||
comment : '내문자 보관함';
|
comment : '내문자 보관함';
|
||||||
@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|||||||
import org.springframework.web.bind.annotation.RequestMethod;
|
import org.springframework.web.bind.annotation.RequestMethod;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
import com.itn.mjonApi.cmn.idgen.mapper.domain.SendMsgVO;
|
import com.itn.mjonApi.mjon.api.access.service.mapper.domain.SendMsgVO;
|
||||||
import com.itn.mjonApi.cmn.msg.PlainResponse;
|
import com.itn.mjonApi.cmn.msg.PlainResponse;
|
||||||
import com.itn.mjonApi.cmn.msg.RestResponse;
|
import com.itn.mjonApi.cmn.msg.RestResponse;
|
||||||
import com.itn.mjonApi.mjon.api.access.service.AccessKeyService;
|
import com.itn.mjonApi.mjon.api.access.service.AccessKeyService;
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
package com.itn.mjonApi.cmn.msg;
|
package com.itn.mjonApi.mjon.api.send.mapper.domain;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
@ -19,12 +19,13 @@ import org.springframework.http.ResponseEntity;
|
|||||||
*/
|
*/
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
public class MjonResponse {
|
public class MjonResponseVO {
|
||||||
|
|
||||||
private String message;
|
private String message;
|
||||||
private String result;
|
private String result;
|
||||||
private String resultSts; // 수신거부 갯수
|
private String resultSts; // 전송결과 갯수
|
||||||
private String resultBlockSts; // 수신거부 갯수
|
private String resultBlockSts; // 수신거부 갯수
|
||||||
|
private String msgGroupId;
|
||||||
private String afterCash;
|
private String afterCash;
|
||||||
|
|
||||||
|
|
||||||
@ -36,11 +37,11 @@ public class MjonResponse {
|
|||||||
* @return ResponseEntity vo convert
|
* @return ResponseEntity vo convert
|
||||||
* @throws JsonProcessingException
|
* @throws JsonProcessingException
|
||||||
*/
|
*/
|
||||||
public static MjonResponse getMjonResponse(ResponseEntity<String> stringResponseEntity) throws JsonProcessingException {
|
public static MjonResponseVO getMjonResponse(ResponseEntity<String> stringResponseEntity) throws JsonProcessingException {
|
||||||
ObjectMapper objectMapper = new ObjectMapper();
|
ObjectMapper objectMapper = new ObjectMapper();
|
||||||
|
|
||||||
MjonResponse mjonResponse = objectMapper.readValue(stringResponseEntity.getBody(), MjonResponse.class);
|
MjonResponseVO mjonResponseVO = objectMapper.readValue(stringResponseEntity.getBody(), MjonResponseVO.class);
|
||||||
return mjonResponse;
|
return mjonResponseVO;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -23,7 +23,7 @@ import java.util.List;
|
|||||||
@Setter
|
@Setter
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class MjonMsgVO implements Serializable {
|
public class MsgRequestVO implements Serializable {
|
||||||
|
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
@ -1,10 +1,10 @@
|
|||||||
package com.itn.mjonApi.mjon.api.send.service;
|
package com.itn.mjonApi.mjon.api.send.service;
|
||||||
|
|
||||||
import com.itn.mjonApi.cmn.msg.MjonResponse;
|
import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonResponseVO;
|
||||||
import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonMsgVO;
|
import com.itn.mjonApi.mjon.api.send.mapper.domain.MsgRequestVO;
|
||||||
|
|
||||||
public interface SendService {
|
public interface SendService {
|
||||||
|
|
||||||
|
|
||||||
MjonResponse sendMsgData(MjonMsgVO mjonMsgVO) throws Exception;
|
MjonResponseVO sendMsgData(MsgRequestVO msgRequestVO) throws Exception;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
package com.itn.mjonApi.mjon.api.send.service.impl;
|
package com.itn.mjonApi.mjon.api.send.service.impl;
|
||||||
|
|
||||||
import com.itn.mjonApi.cmn.apiServer.ApiService;
|
import com.itn.mjonApi.cmn.apiServer.ApiService;
|
||||||
import com.itn.mjonApi.cmn.msg.MjonResponse;
|
import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonResponseVO;
|
||||||
import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonMsgVO;
|
import com.itn.mjonApi.mjon.api.send.mapper.domain.MsgRequestVO;
|
||||||
import com.itn.mjonApi.mjon.api.send.service.SendService;
|
import com.itn.mjonApi.mjon.api.send.service.SendService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.catalina.connector.Response;
|
import org.apache.catalina.connector.Response;
|
||||||
@ -23,25 +23,29 @@ public class SendServiceImpl implements SendService {
|
|||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public MjonResponse sendMsgData(MjonMsgVO mjonMsgVO) throws Exception {
|
public MjonResponseVO sendMsgData(MsgRequestVO msgRequestVO) throws Exception {
|
||||||
|
|
||||||
// 스팸체크 하는 부분
|
// 스팸체크 하는 부분
|
||||||
MjonResponse spamChkEntity = apiService.postForEntity(
|
MjonResponseVO spamChkEntity = apiService.postForEntity(
|
||||||
"/web/user/login/selectSpamTxtChkAjax.do"
|
"/web/user/login/selectSpamTxtChkAjax.do"
|
||||||
, mjonMsgVO
|
, msgRequestVO
|
||||||
, String.class
|
, String.class
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if("spams".equals(spamChkEntity.getResult())){
|
||||||
|
msgRequestVO.setSpamStatus("Y");
|
||||||
|
};
|
||||||
|
|
||||||
// 문자 전송하는 부분
|
// 문자 전송하는 부분
|
||||||
MjonResponse munjaSendResponse = apiService.postForEntity(
|
MjonResponseVO munjaSendResponse = apiService.postForEntity(
|
||||||
"/web/user/login/sendMsgDataAjax.do"
|
"/web/user/login/sendMsgDataAjax.do"
|
||||||
, mjonMsgVO
|
, msgRequestVO
|
||||||
, String.class
|
, String.class
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return spamChkEntity;
|
return munjaSendResponse;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
package com.itn.mjonApi.mjon.api.send.web;
|
package com.itn.mjonApi.mjon.api.send.web;
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import com.itn.mjonApi.cmn.msg.MjonResponse;
|
import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonResponseVO;
|
||||||
import com.itn.mjonApi.mjon.api.send.mapper.domain.MjonMsgVO;
|
import com.itn.mjonApi.mjon.api.send.mapper.domain.MsgRequestVO;
|
||||||
import com.itn.mjonApi.mjon.api.send.service.SendService;
|
import com.itn.mjonApi.mjon.api.send.service.SendService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@ -43,45 +43,45 @@ public class SendRestController {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param mjonMsgVO
|
* @param msgRequestVO
|
||||||
* @Discription 문자 발송 테스트
|
* @Discription 문자 발송 테스트
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@PostMapping("/api/sendTest")
|
@PostMapping("/api/sendTest")
|
||||||
public MjonResponse sendTest(MjonMsgVO mjonMsgVO) throws Exception {
|
public MjonResponseVO sendTest(MsgRequestVO msgRequestVO) throws Exception {
|
||||||
|
|
||||||
return sendService.sendMsgData(mjonMsgVO);
|
return sendService.sendMsgData(msgRequestVO);
|
||||||
|
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param mjonMsgVO
|
* @param msgRequestVO
|
||||||
* @Discription 스팸문자 테스트
|
* @Discription 스팸문자 테스트
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@PostMapping("/api/selectSpamTxtChkAjax")
|
@PostMapping("/api/selectSpamTxtChkAjax")
|
||||||
public Object selectSpamTxtChkAjax(MjonMsgVO mjonMsgVO){
|
public Object selectSpamTxtChkAjax(MsgRequestVO msgRequestVO){
|
||||||
log.info(" :: START/api/selectSpamTxtChkAjax smsTxt :: [{}]", mjonMsgVO.getSmsTxt());
|
log.info(" :: START/api/selectSpamTxtChkAjax smsTxt :: [{}]", msgRequestVO.getSmsTxt());
|
||||||
|
|
||||||
ResponseEntity<String> stringResponseEntity = restTemplate.postForEntity(
|
ResponseEntity<String> stringResponseEntity = restTemplate.postForEntity(
|
||||||
"http://localhost:8080/web/user/login/selectSpamTxtChkAjax.do"
|
"http://localhost:8080/web/user/login/selectSpamTxtChkAjax.do"
|
||||||
, mjonMsgVO
|
, msgRequestVO
|
||||||
, String.class
|
, String.class
|
||||||
);
|
);
|
||||||
|
|
||||||
ObjectMapper objectMapper = new ObjectMapper();
|
ObjectMapper objectMapper = new ObjectMapper();
|
||||||
MjonResponse mjonResponse = new MjonResponse();
|
MjonResponseVO mjonResponseVO = new MjonResponseVO();
|
||||||
|
|
||||||
log.info("stringResponseEntity :: [{}]", stringResponseEntity.getBody());
|
log.info("stringResponseEntity :: [{}]", stringResponseEntity.getBody());
|
||||||
log.info("stringResponseEntity :: [{}]", stringResponseEntity);
|
log.info("stringResponseEntity :: [{}]", stringResponseEntity);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
mjonResponse = objectMapper.readValue(stringResponseEntity.getBody(), MjonResponse.class);
|
mjonResponseVO = objectMapper.readValue(stringResponseEntity.getBody(), MjonResponseVO.class);
|
||||||
|
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
return mjonResponse;
|
return mjonResponseVO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
package com.itn.mjonApi.mjon.log.service;
|
package com.itn.mjonApi.mjon.log.service;
|
||||||
|
|
||||||
import com.itn.mjonApi.cmn.idgen.mapper.domain.LettnLoginLogVO;
|
import com.itn.mjonApi.mjon.log.service.mapper.domain.LettnLoginLogVO;
|
||||||
import com.itn.mjonApi.cmn.msg.RestResponse;
|
import com.itn.mjonApi.cmn.msg.RestResponse;
|
||||||
|
|
||||||
public interface LettnLoginLogService {
|
public interface LettnLoginLogService {
|
||||||
|
|||||||
@ -1,18 +1,15 @@
|
|||||||
package com.itn.mjonApi.mjon.log.service.impl;
|
package com.itn.mjonApi.mjon.log.service.impl;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import com.itn.mjonApi.cmn.msg.RestResponse;
|
||||||
import java.util.List;
|
import com.itn.mjonApi.mjon.log.service.LettnLoginLogService;
|
||||||
|
import com.itn.mjonApi.mjon.log.service.mapper.LettnLoginLogMapper;
|
||||||
|
import com.itn.mjonApi.mjon.log.service.mapper.domain.LettnLoginLogVO;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO;
|
import java.time.LocalDateTime;
|
||||||
import com.itn.mjonApi.cmn.idgen.mapper.domain.IdgenVO;
|
import java.util.List;
|
||||||
import com.itn.mjonApi.cmn.idgen.mapper.domain.LettnLoginLogVO;
|
|
||||||
import com.itn.mjonApi.cmn.msg.RestResponse;
|
|
||||||
import com.itn.mjonApi.mjon.log.service.LettnLoginLogService;
|
|
||||||
import com.itn.mjonApi.mjon.log.service.mapper.LettnLoginLogMapper;
|
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class LettnLoginLogServiceImpl implements LettnLoginLogService {
|
public class LettnLoginLogServiceImpl implements LettnLoginLogService {
|
||||||
|
|||||||
@ -1,10 +1,9 @@
|
|||||||
package com.itn.mjonApi.mjon.log.service.mapper;
|
package com.itn.mjonApi.mjon.log.service.mapper;
|
||||||
|
|
||||||
import java.util.List;
|
import com.itn.mjonApi.mjon.log.service.mapper.domain.LettnLoginLogVO;
|
||||||
|
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
import com.itn.mjonApi.cmn.idgen.mapper.domain.LettnLoginLogVO;
|
import java.util.List;
|
||||||
|
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface LettnLoginLogMapper {
|
public interface LettnLoginLogMapper {
|
||||||
|
|||||||
@ -0,0 +1,30 @@
|
|||||||
|
package com.itn.mjonApi.mjon.log.service.mapper.domain;
|
||||||
|
/*
|
||||||
|
table : mj_mymsg
|
||||||
|
comment : '내문자 보관함';
|
||||||
|
*/
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class LettnApiSendMsgLogVO implements Serializable {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
private String LOG_NO; // access log 고유번호
|
||||||
|
private String MBER_ID; // 일반회원ID
|
||||||
|
private String MSG_GROUP_ID; // 문자 그룹 ID
|
||||||
|
private String REQ_REGIST_PNTTM; // 요청등록일시
|
||||||
|
private String REQ_REGISTER_ID; // 요청등록자ID
|
||||||
|
private String RES_UPDT_PNTTM; // 응답수정일시
|
||||||
|
private String RES_UPDUSR_ID;//응답수정자ID
|
||||||
|
|
||||||
|
}
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package com.itn.mjonApi.cmn.idgen.mapper.domain;
|
package com.itn.mjonApi.mjon.log.service.mapper.domain;
|
||||||
/*
|
/*
|
||||||
table : mj_mymsg
|
table : mj_mymsg
|
||||||
comment : '내문자 보관함';
|
comment : '내문자 보관함';
|
||||||
@ -1,17 +0,0 @@
|
|||||||
package com.itn.mjonApi.mjon.member.mapper;
|
|
||||||
|
|
||||||
import com.itn.mjonApi.mjon.member.mapper.domain.MyMsgVO;
|
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
|
||||||
import org.apache.ibatis.annotations.Select;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Mapper
|
|
||||||
public interface MyMsgMapper {
|
|
||||||
|
|
||||||
/**/
|
|
||||||
List<MyMsgVO> findAll();
|
|
||||||
|
|
||||||
@Select("select * from MJ_MYMSG")
|
|
||||||
List<MyMsgVO> findAll_2();
|
|
||||||
}
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
package com.itn.mjonApi.mjon.member.mapper.domain;
|
|
||||||
/*
|
|
||||||
table : mj_mymsg
|
|
||||||
comment : '내문자 보관함';
|
|
||||||
*/
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
import lombok.Setter;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
|
|
||||||
@Getter
|
|
||||||
@Setter
|
|
||||||
@NoArgsConstructor
|
|
||||||
@AllArgsConstructor
|
|
||||||
public class MyMsgVO implements Serializable {
|
|
||||||
|
|
||||||
|
|
||||||
private Integer msgId; /*auto_increment comment '문자 고유아이디' primary key*/
|
|
||||||
private String mberId; /*comment '회원 아이디'*/
|
|
||||||
private String esntlId; /*null comment '회원고유 아이디'*/
|
|
||||||
private String subject; /*null comment '문자 제목'*/
|
|
||||||
private String smsTxt; /*null comment '문자 내용'*/
|
|
||||||
private String smsLen; /*null comment '문자 길이'*/
|
|
||||||
private String atchFileId1; /*null comment '첨부파일번호'*/
|
|
||||||
private String atchFileId2; /*null comment '첨부파일번호'*/
|
|
||||||
private String atchFileId3; /*null comment '첨부파일번호'*/
|
|
||||||
private String regdate; /*null comment '등록일자'*/
|
|
||||||
private String msgType; /*default 'S' null comment '문자종류'*/
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
package com.itn.mjonApi.mjon.member.service;
|
|
||||||
|
|
||||||
import com.itn.mjonApi.cmn.msg.RestResponse;
|
|
||||||
|
|
||||||
public interface MemberService {
|
|
||||||
|
|
||||||
|
|
||||||
RestResponse findAll();
|
|
||||||
|
|
||||||
RestResponse findAll2();
|
|
||||||
}
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
package com.itn.mjonApi.mjon.member.service.impl;
|
|
||||||
|
|
||||||
import com.itn.mjonApi.cmn.msg.RestResponse;
|
|
||||||
import com.itn.mjonApi.mjon.member.mapper.MyMsgMapper;
|
|
||||||
import com.itn.mjonApi.mjon.member.mapper.domain.MyMsgVO;
|
|
||||||
import com.itn.mjonApi.mjon.member.service.MemberService;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.http.HttpStatus;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Service
|
|
||||||
public class MemberServiceImpl implements MemberService {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
MyMsgMapper myMsgMapper;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public RestResponse findAll() {
|
|
||||||
List<MyMsgVO> MyMsgListVO = myMsgMapper.findAll();
|
|
||||||
return new RestResponse(HttpStatus.OK, "성공", LocalDateTime.now(), MyMsgListVO);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public RestResponse findAll2() {
|
|
||||||
List<MyMsgVO> MyMsgListVO = myMsgMapper.findAll_2();
|
|
||||||
return new RestResponse(HttpStatus.OK, "성공", LocalDateTime.now(), MyMsgListVO);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
package com.itn.mjonApi.mjon.member.web;
|
|
||||||
|
|
||||||
import com.itn.mjonApi.cmn.msg.RestResponse;
|
|
||||||
import com.itn.mjonApi.mjon.member.service.MemberService;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
@RestController
|
|
||||||
public class MemberRestController {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private MemberService memberService;
|
|
||||||
|
|
||||||
@GetMapping("/member/mymsg")
|
|
||||||
public ResponseEntity<RestResponse> mymsg(){
|
|
||||||
return ResponseEntity.ok(memberService.findAll());
|
|
||||||
}
|
|
||||||
|
|
||||||
@GetMapping("/member/mymsg_2")
|
|
||||||
public ResponseEntity<RestResponse> mymsg2(){
|
|
||||||
return ResponseEntity.ok(memberService.findAll2());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -14,4 +14,5 @@ server.port=8088
|
|||||||
|
|
||||||
logging.level.root=info
|
logging.level.root=info
|
||||||
|
|
||||||
api.root.url=http://192.168.0.125:8095/
|
#api.root.url=http://192.168.0.125:8095/
|
||||||
|
api.root.url=http://localhost:8080/
|
||||||
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
<mapper namespace="com.itn.mjonApi.mjon.api.access.service.mapper.AccessKeyMapper">
|
<mapper namespace="com.itn.mjonApi.mjon.api.access.service.mapper.AccessKeyMapper">
|
||||||
|
|
||||||
<select id="findAll" resultType="com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO">
|
<select id="findAll" resultType="com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO">
|
||||||
SELECT
|
SELECT
|
||||||
*
|
*
|
||||||
FROM lettngnrlmber_access_key
|
FROM lettngnrlmber_access_key
|
||||||
@ -74,7 +74,7 @@
|
|||||||
<!-- access_key 정보 R -->
|
<!-- access_key 정보 R -->
|
||||||
<!-- <include refid="AccessKeyDAO.select_column_name"/> -->
|
<!-- <include refid="AccessKeyDAO.select_column_name"/> -->
|
||||||
<!-- <include refid="AccessKeyDAO.table_name"/> a -->
|
<!-- <include refid="AccessKeyDAO.table_name"/> a -->
|
||||||
<select id="selectR" resultType="com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO">
|
<select id="selectR" resultType="com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO">
|
||||||
SELECT
|
SELECT
|
||||||
<include refid="select_column_name"/>
|
<include refid="select_column_name"/>
|
||||||
FROM
|
FROM
|
||||||
@ -84,7 +84,7 @@
|
|||||||
|
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectRKey" resultType="com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO">
|
<select id="selectRKey" resultType="com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO">
|
||||||
SELECT
|
SELECT
|
||||||
<include refid="select_column_name"/>
|
<include refid="select_column_name"/>
|
||||||
FROM
|
FROM
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
<mapper namespace="com.itn.mjonApi.mjon.api.access.service.mapper.AccessTokenMapper">
|
<mapper namespace="com.itn.mjonApi.mjon.api.access.service.mapper.AccessTokenMapper">
|
||||||
|
|
||||||
<select id="findAll" resultType="com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO">
|
<select id="findAll" resultType="com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO">
|
||||||
SELECT
|
SELECT
|
||||||
*
|
*
|
||||||
FROM lettngnrlmber_access_token
|
FROM lettngnrlmber_access_token
|
||||||
@ -74,7 +74,7 @@
|
|||||||
<!-- access_key 정보 R -->
|
<!-- access_key 정보 R -->
|
||||||
<!-- <include refid="AccessKeyDAO.select_column_name"/> -->
|
<!-- <include refid="AccessKeyDAO.select_column_name"/> -->
|
||||||
<!-- <include refid="AccessKeyDAO.table_name"/> a -->
|
<!-- <include refid="AccessKeyDAO.table_name"/> a -->
|
||||||
<select id="selectR" resultType="com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO">
|
<select id="selectR" resultType="com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO">
|
||||||
SELECT
|
SELECT
|
||||||
<include refid="select_column_name"/>
|
<include refid="select_column_name"/>
|
||||||
FROM
|
FROM
|
||||||
@ -85,7 +85,7 @@
|
|||||||
|
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectRToken" resultType="com.itn.mjonApi.cmn.idgen.mapper.domain.AccessKeyVO">
|
<select id="selectRToken" resultType="com.itn.mjonApi.mjon.api.access.service.mapper.domain.AccessKeyVO">
|
||||||
SELECT
|
SELECT
|
||||||
<include refid="select_column_name"/>
|
<include refid="select_column_name"/>
|
||||||
FROM
|
FROM
|
||||||
|
|||||||
@ -63,7 +63,7 @@
|
|||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
<!-- access_key 정보 R -->
|
<!-- access_key 정보 R -->
|
||||||
<select id="selectR" resultType="com.itn.mjonApi.cmn.idgen.mapper.domain.LettnLoginLogVO">
|
<select id="selectR" resultType="com.itn.mjonApi.mjon.log.service.mapper.domain.LettnLoginLogVO">
|
||||||
SELECT
|
SELECT
|
||||||
<include refid="select_column_name"/>
|
<include refid="select_column_name"/>
|
||||||
FROM
|
FROM
|
||||||
@ -73,7 +73,7 @@
|
|||||||
|
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectRKey" resultType="com.itn.mjonApi.cmn.idgen.mapper.domain.LettnLoginLogVO">
|
<select id="selectRKey" resultType="com.itn.mjonApi.mjon.log.service.mapper.domain.LettnLoginLogVO">
|
||||||
SELECT
|
SELECT
|
||||||
<include refid="select_column_name"/>
|
<include refid="select_column_name"/>
|
||||||
FROM
|
FROM
|
||||||
@ -115,7 +115,7 @@
|
|||||||
LOG_ID = #{logId}
|
LOG_ID = #{logId}
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<select id="selectIgnoreIpCnt" resultType="com.itn.mjonApi.cmn.idgen.mapper.domain.LettnLoginLogVO">
|
<select id="selectIgnoreIpCnt" resultType="com.itn.mjonApi.mjon.log.service.mapper.domain.LettnLoginLogVO">
|
||||||
SELECT
|
SELECT
|
||||||
COUNT(A.IGNORE_NO) AS CNT
|
COUNT(A.IGNORE_NO) AS CNT
|
||||||
FROM mj_ignore_ip A
|
FROM mj_ignore_ip A
|
||||||
|
|||||||
@ -1,14 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
|
|
||||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
|
||||||
|
|
||||||
<mapper namespace="com.itn.mjonApi.mjon.member.mapper.MyMsgMapper">
|
|
||||||
|
|
||||||
<select id="findAll">
|
|
||||||
SELECT
|
|
||||||
*
|
|
||||||
FROM MJ_MYMSG
|
|
||||||
</select>
|
|
||||||
|
|
||||||
</mapper>
|
|
||||||
Loading…
Reference in New Issue
Block a user