selectAuthorAllList(AuthorManageVO authorManageVO) throws Exception {
- return selectList("authorManageDAO.selectAuthorAllList", authorManageVO);
+ return selectList("authorManageDAO.selectAuthorAllList", authorManageVO);
}
}
diff --git a/src/main/java/egovframework/com/sec/ram/web/EgovAuthorRoleController.java b/src/main/java/egovframework/com/sec/ram/web/EgovAuthorRoleController.java
index b622c1089..d83782455 100644
--- a/src/main/java/egovframework/com/sec/ram/web/EgovAuthorRoleController.java
+++ b/src/main/java/egovframework/com/sec/ram/web/EgovAuthorRoleController.java
@@ -35,7 +35,7 @@
*/
@Controller
public class EgovAuthorRoleController {
-
+
@Resource(name="egovMessageSource")
EgovMessageSource egovMessageSource;
diff --git a/src/main/java/egovframework/com/sec/rnc/service/EgovRlnmManageService.java b/src/main/java/egovframework/com/sec/rnc/service/EgovRlnmManageService.java
deleted file mode 100644
index 6f225dbb2..000000000
--- a/src/main/java/egovframework/com/sec/rnc/service/EgovRlnmManageService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package egovframework.com.sec.rnc.service;
-
-
-/**
- * 실명인증관리에 관한 인터페이스클래스를 정의한다.
- * @author 공통서비스 개발팀 조재영
- * @since 2009.04.10
- * @version 1.0
- * @see
- *
- *
- * << 개정이력(Modification Information) >>
- *
- * 수정일 수정자 수정내용
- * ------- -------- ---------------------------
- * 2009.04.10 조재영 최초 생성
- *
- *
- */
-public interface EgovRlnmManageService {
-
- /**
- * 실명인증확인화면 호출(주민번호)
- * @param ihidnum 주민등록번호
- * @param realname 실명
- * @param sbscrbTy 사용자 유형
- * @return result 결과메시지코드
- * @throws Exception
- */
-
- public String rlnmCnfirm(String ihidnum, String realname, String sbscrbTy)throws Exception;
-
- /**
- * 실명인증확인화면 호출(GPIN)
- * @param pinId 공공아이핀 아이디
- * @param pinPassword 공공아이핀 패스워드
- * @param sbscrbTy 사용자 유형
- * @return result 결과메시지코드
- * @throws Exception
- */
- public String rlnmPinCnfirm(String pinId, String pinPassword, String sbscrbTy)throws Exception;
-}
\ No newline at end of file
diff --git a/src/main/java/egovframework/com/sec/rnc/service/EgovSocketClient.java b/src/main/java/egovframework/com/sec/rnc/service/EgovSocketClient.java
deleted file mode 100644
index c2e5fe33c..000000000
--- a/src/main/java/egovframework/com/sec/rnc/service/EgovSocketClient.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package egovframework.com.sec.rnc.service;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.net.Socket;
-
-import egovframework.com.cmm.service.Globals;
-import egovframework.com.cmm.util.EgovResourceCloseHelper;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * G4C 연계용 배포파일- SocketClient.java
- * @author 공통서비스 개발팀 조재영
- * @since 2009.04.10
- * @version 1.0
- * @see
- *
- *
- * << 개정이력(Modification Information) >>
- *
- * 수정일 수정자 수정내용
- * ------- -------- ---------------------------
- * 2009.04.10 조재영 최초 생성
- * 2011.10.10 이기하 보안점검 후속초치(디버거코드 주석처리)
- *
- *
- */
-public class EgovSocketClient {
- private static final int MAX_SIZE_OF_MESSAGE = 1024 * 1024;
- private BufferedInputStream inStream = null;
- private BufferedOutputStream outStream = null;
-
- /** log */
- private static final Logger LOGGER = LoggerFactory.getLogger(EgovSocketClient.class);
-
- public EgovSocketClient() {
- }
-
- public byte[] execute(String pm_sData) {
- Socket socket = null;
- byte[] lm_bRecvData = null;
- try {
- socket = EgovTimedSocket.getSocketClient(Globals.LOCAL_IP, 1235, 5000);
- socket.setSoTimeout(5000);
- inStream = new BufferedInputStream(socket.getInputStream(), 512);
- outStream = new BufferedOutputStream(socket.getOutputStream(), 512);
- sendHeader(pm_sData.getBytes());
- sendData(pm_sData.getBytes());
- int lm_iRecvDataLength = recvHeader();
- lm_bRecvData = new byte[lm_iRecvDataLength];
- readAllByte(lm_bRecvData, 0, lm_iRecvDataLength, inStream);
- } catch (IOException e) {
- LOGGER.error("IO Exception", e);
- } finally {
- EgovResourceCloseHelper.close(outStream, inStream);
- EgovResourceCloseHelper.closeSockets(socket);
- }
- return lm_bRecvData;
- }
-
- private int recvHeader() {
- int dataLength = 0;
-
- try {
- // 정보 받기
- // 헤더정보 받기, 뒤에 따라올 데이터의 길이를 알려준다.
- byte[] recvHeader = new byte[4];
-
- if (inStream.read(recvHeader, 0, recvHeader.length) < 4) {
- //System.out.println("받은 데이터 헤더가 형식에 맞지 않습니다.");
- dataLength = -1;
- }
-
- int b1 = recvHeader[0];
- int b2 = recvHeader[1];
- int b3 = recvHeader[2];
- int b4 = recvHeader[3];
-
- b1 = b1 & 0xFF;
- b2 = b2 & 0xFF;
- b3 = b3 & 0xFF;
- b4 = b4 & 0xFF;
-
- dataLength = (b1 << 24) | (b2 << 16) | (b3 << 8) | b4;
-
- if (MAX_SIZE_OF_MESSAGE < dataLength) {
- dataLength = -1;
- }
- } catch (IOException e) {
- dataLength = -1;
- }
-
- return dataLength;
- }
-
- /**
- * 서버에서 보낸 정보를 읽어들인다.
- *
- * @param buf 데이터를 읽어들일 버퍼
- * @param offset 데이터를 읽어들일 시작위치
- * @param length 읽어들일 데이터의 길이
- * @param in 데이터를 읽어들일 입력 스트림
- * @throws IOException 데이터를 읽을때 발생하는 오류
- */
- public void readAllByte(byte[] buf, int offset, int length, BufferedInputStream in) throws IOException {
-
- // 읽어 들인 전체 바이트
- int totalReadByteNum = 0;
-
- //처음으로 읽기를 시작한다.
- int tempReadByte = in.read(buf, offset, length);
-
- //읽은 결과가 -1이면
- if (tempReadByte == -1) {
- return;
- }
-
- //읽은 바이트수를 계산한다.
- totalReadByteNum += tempReadByte;
-
- //읽은 바이트 의 수가 받으려하는 바이트보다 작다면 다받을 때까지 받는다.
- while (totalReadByteNum < length) {
- int reReadToByteNum = length - totalReadByteNum;
- int reReadByteNum = in.read(buf, totalReadByteNum, reReadToByteNum);
-
- //읽은 결과가 -1이면
- if (reReadByteNum == -1) {
- break;
- }
-
- totalReadByteNum += reReadByteNum;
- }
- }
-
- /**
- * 데이터의 길이를 소켓을 통해 전송한다.
- *
- * @param data 길이를 전송할 데이터의 byte 배열
- */
- private void sendHeader(byte[] data) throws IOException {
- byte[] sendHeader = new byte[4];
-
- int value = data.length;
- int b1 = (value >>> 24) & 0xFF;
- int b2 = (value >>> 16) & 0xFF;
- int b3 = (value >>> 8) & 0xFF;
- int b4 = (value >>> 0) & 0xFF;
-
- sendHeader[0] = (byte) b1;
- sendHeader[1] = (byte) b2;
- sendHeader[2] = (byte) b3;
- sendHeader[3] = (byte) b4;
- outStream.write(sendHeader, 0, sendHeader.length);
- outStream.flush();
- }
-
- /**
- * 소켓을 이용하여 데이터를 전송한다.
- *
- * @param data 전송할 데이터의 byte 배열
- */
- private void sendData(byte[] data) throws IOException {
- outStream.write(data);
- outStream.flush();
- }
-
- /**
- * 배포된 파일을 로컬에서 직접테스트시 참조할 수 있는 코드(직접실행시 사용)
- */
- /** 2011.10.10 cmd 라인상에서 편의제공을 위해 제공, 필요없을시 삭제하여도 무방함
- public static void main(String agrs[])
- {
- EgovSocketClient lm_oSocketClient = new EgovSocketClient();
- try
- {
- /*
- * 서비스구분코드|인증서CN|이름|주민번호
- *
- * 인증서 파일 에서 숫자에 해당하는 값:예) SVR1310000001_***.***
- * 1310000001이 인증서CN 값 이다
- */
- /**
- byte[] lm_bResult1 = lm_oSocketClient.execute("12|1310000001|홍길동|주민번호");
- //System.out.println("결과:"+new String(lm_bResult1));
- }
- catch(Exception e)
- {
- //e.printStackTrace()
- System.out.println(e);
- }
- }
- */
-}
diff --git a/src/main/java/egovframework/com/sec/rnc/service/EgovTimedSocket.java b/src/main/java/egovframework/com/sec/rnc/service/EgovTimedSocket.java
deleted file mode 100644
index bdeb2db81..000000000
--- a/src/main/java/egovframework/com/sec/rnc/service/EgovTimedSocket.java
+++ /dev/null
@@ -1,226 +0,0 @@
-package egovframework.com.sec.rnc.service;
-
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.net.InetAddress;
-import java.net.Socket;
-
-import javax.net.ssl.SSLSocketFactory;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import egovframework.com.cmm.EgovWebUtil;
-
-/**
- * G4C 연계용 배포파일- TimedSocket.java
- * @author 공통서비스 개발팀 조재영
- * @since 2009.04.10
- * @version 1.0
- * @see
- *
- *
- * << 개정이력(Modification Information) >>
- *
- * 수정일 수정자 수정내용
- * ------- -------- ---------------------------
- * 2009.04.10 조재영 최초 생성
- * 2011.10.10 이기하 보안점검 후속초치(디버거코드 주석처리)
- *
- *
- */
-public class EgovTimedSocket
-{
- private static final Logger LOGGER = LoggerFactory.getLogger(EgovTimedSocket.class);
-
- /**
- * 특정주소로 연결시도한다.(InetAdress로 연결)
- *
- * @param iaddr hostaddress
- * @param connectPort service port
- * @param delayTime Delay(milliseconds)
- */
- public static Socket getSocketClient ( InetAddress iaddr, int connectPort, int delayTime) throws InterruptedIOException, IOException
- {
- SocketAction sa = new SocketAction( iaddr, connectPort );
- sa.start();
-
- int timeCheck = 0;
- Socket socket = null;
-
- for (;;)
- {
- if (sa.isConnected()){
- socket = sa.getSocketThread();
- break;
- }
- else
- {
- if (sa.isFail()){
- sa.getException();
- }
-
- try{
- Thread.sleep ( TIME_DELAY );
- }
- catch (InterruptedException ine) {
- // 2011.10.10 보안점검 후속조치
- LOGGER.error("Exception: {}", ine.getClass().getName());
- LOGGER.error("Exception Message: {}", ine.getMessage());
- }
-
- timeCheck += TIME_DELAY;
-
- if (timeCheck > delayTime){
- throw new InterruptedIOException("connect fail , time over : " + delayTime);
- }
- }
- }
-
- return socket;
- }
-
- /**
- * 특정주소로 연결시도한다.(주소로 직접 연결)
- *
- * @param ihost hostname
- * @param connectPort Port of service
- * @param delayTime Delay in milliseconds
- */
- public static Socket getSocketClient ( String ihost, int connectPort, int delayTime) throws InterruptedIOException, IOException
- {
- if (!EgovWebUtil.isIPAddress(ihost)) { // 2011.10.25 보안점검 후속조치
- throw new RuntimeException("IP is needed. (" + ihost + ")");
- }
-
- InetAddress inetAddr = InetAddress.getByName (ihost);
- return getSocketClient ( inetAddr, connectPort, delayTime );
- }
-
- /**
- * 배포된 파일을 로컬에서 직접테스트시 참조할 수 있는 코드(직접실행시 사용)
- */
- /** 2011.10.10 cmd 라인상에서 편의제공을 위해 제공, 필요없을시 삭제하여도 무방함
- public static void main(String args[]) throws Exception
- {
- try
- {
- Socket s = EgovTimedSocket.getSocketClient ("192.168.100.21", 80, 5000);
- s.close();
- }
- catch (IOException ioe)
- {
- //ioe.printStackTrace();
- LOG.error("Exception: " + ioe.getClass().getName());
- LOG.error("Exception Message: " + ioe.getMessage());
- }
-
- }
- */
-
- // Inner class
- static class SocketAction extends Thread
- {
- volatile private Socket threadSocket = null;
- private String threadHost = null;
- private InetAddress threadInetAddr = null;
- private int threadPort = 0;
- private IOException threadException = null;
-
- public SocketAction ( String host, int port)
- {
- threadHost = host;
- threadPort = port;
- }
-
- public SocketAction ( InetAddress inetAddr, int port )
- {
- threadInetAddr = inetAddr;
- threadPort = port;
- }
-
- public SocketAction ( InetAddress inetAddr, String host, int port )
- {
- if(host!=null){
- threadHost = host;
- threadPort = port;
- }else if(inetAddr!=null){
- threadInetAddr = inetAddr;
- threadPort = port;
- }
- }
-
- @Override
- public void run()
- {
- Socket sock = null;
-
- try
- {
- if (threadHost != null) {
- sock = SSLSocketFactory.getDefault().createSocket(threadHost, threadPort);//2022.01. Unencrypted Socket 처리
-
- }
- else{
- sock = SSLSocketFactory.getDefault().createSocket(threadInetAddr, threadPort); //2022.01. Unencrypted Socket 처리
- }
- }
- catch (IOException ioe)
- {
- threadException = ioe;
- return;
- }
- threadSocket = sock;
- }
-
- public Socket getSocketThread()
- {
- return threadSocket;
- }
-
- public boolean isFail()
- {
- if (threadException == null) {
- return false;
- } else {
- return true;
- }
- }
-
- public boolean isConnected()
- {
- if (threadSocket == null) {
- return false;
- } else {
- return true;
- }
- }
-
- public String getThreadSocket()
- {
- if (threadSocket == null) {
- return "";
- } else {
- return threadHost;
- }
- }
-
- public String getThreadInetAddr()
- {
- if (threadInetAddr == null) {
- return "";
- } else
- if (!EgovWebUtil.isIPAddress(threadInetAddr.getHostAddress())) { // 2011.10.25 보안점검 후속조치
- throw new RuntimeException("IP is needed. (" + threadInetAddr.getHostAddress() + ")");
- }
- return threadInetAddr.getHostAddress();
- }
-
- public IOException getException()
- {
- return threadException;
- }
- }
-
- private static final int TIME_DELAY = 100;
-}
diff --git a/src/main/java/egovframework/com/sec/rnc/service/impl/EgovRlnmManageServiceImpl.java b/src/main/java/egovframework/com/sec/rnc/service/impl/EgovRlnmManageServiceImpl.java
deleted file mode 100644
index 07e8d3053..000000000
--- a/src/main/java/egovframework/com/sec/rnc/service/impl/EgovRlnmManageServiceImpl.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package egovframework.com.sec.rnc.service.impl;
-
-import egovframework.com.sec.rnc.service.EgovRlnmManageService;
-import egovframework.com.sec.rnc.service.EgovSocketClient;
-
-import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl;
-
-import org.springframework.stereotype.Service;
-
-/**
- * 실명인증관리에 관한비지니스클래스를 정의한다.
- * @author 공통서비스 개발팀 조재영
- * @since 2009.04.10
- * @version 1.0
- * @see
- *
- *
- * << 개정이력(Modification Information) >>
- *
- * 수정일 수정자 수정내용
- * ------- -------- ---------------------------
- * 2009.04.10 조재영 최초 생성
- *
- *
- */
-@Service("rlnmManageService")
-public class EgovRlnmManageServiceImpl extends EgovAbstractServiceImpl implements EgovRlnmManageService {
-
- //private static final Logger LOGGER = LoggerFactory.getLogger(EgovRlnmManageServiceImpl.class);
-
- /**
- * 실명인증확인화면 호출(주민번호)
- * @param ihidnum 주민등록번호
- * @param realname 실명
- * @param sbscrbTy 사용자 유형
- * @return result 결과메시지코드
- * @throws Exception
- */
- @Override
- public String rlnmCnfirm(String ihidnum, String realname, String sbscrbTy) {
- String result = "ERR";
-
- EgovSocketClient lm_oSocketClient = new EgovSocketClient();
-
- /*
- * 서비스구분코드|인증서CN|이름|주민번호
- *
- * 인증서 파일 에서 숫자에 해당하는 값:예) SVR1310000001_***.***
- * 1310000001이 인증서CN 값 이다
- */
- String str = "99|1311000011|" + realname + "|" + ihidnum;
- //String str = "99|1311000011|홍길동|주민번호";
- byte[] lm_bResult1 = lm_oSocketClient.execute(str);
- result = new String(lm_bResult1);
-
- return result;
- }
-
- /**
- * 실명인증확인화면 호출(GPIN)
- * @param pinId 공공아이핀 아이디
- * @param pinPassword 공공아이핀 패스워드
- * @param sbscrbTy 사용자 유형
- * @return result 결과메시지코드
- * @throws Exception
- */
- @Override
- public String rlnmPinCnfirm(String pinId, String pinPassword, String sbscrbTy) {
- String result = "ERR";
-
- /*
- try {
- // 공공아이핀 센터를 통해 pinId, pinPassword를 검증한다.
- result = "result message";
- } catch (Exception e) {
- LOGGER.error("Exception: {}", e.getClass().getName());
- LOGGER.error("Exception Message: {}", e.getMessage());
- }
- */
-
- return result;
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/egovframework/com/sec/rnc/web/EgovRlnmManageController.java b/src/main/java/egovframework/com/sec/rnc/web/EgovRlnmManageController.java
deleted file mode 100644
index 3b6e65e4b..000000000
--- a/src/main/java/egovframework/com/sec/rnc/web/EgovRlnmManageController.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package egovframework.com.sec.rnc.web;
-
-import java.net.URLDecoder;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import egovframework.com.cmm.EgovWebUtil;
-import egovframework.com.sec.rnc.service.EgovRlnmManageService;
-
-/**
- * 실명인증관련 요청을 비지니스 클래스로 전달하고 처리된결과를 해당 웹 화면으로 전달하는 Controller를 정의한다
- * @author 공통서비스 개발팀 조재영
- * @since 2009.04.10
- * @version 1.0
- * @see
- *
- *
- * << 개정이력(Modification Information) >>
- *
- * 수정일 수정자 수정내용
- * ---------- -------- ---------------------------
- * 2009.04.10 조재영 최초 생성
- * 2019.04.25 신용호 moveToPage() 화이트리스트 처리
- *
- *
- */
-@Controller
-public class EgovRlnmManageController {
-
- /** rlnmManageService */
- @Resource(name = "rlnmManageService")
- private EgovRlnmManageService rlnmManageService;
-
- @Resource(name = "egovPageLinkWhitelist")
- protected List egovWhitelist;
-
- @Resource(name = "egovNextUrlWhitelist")
- protected List nextUrlWhitelist;
-
- /** Log Info */
- private static final Logger LOGGER = LoggerFactory.getLogger(EgovRlnmManageController.class);
-
- /**
- * 실명인증확인화면 호출(주민번호)
- * @param model 모델
- * @return "egovframework/com/uss/umt/EgovStplatCnfirm"
- * @exception Exception
- */
- @RequestMapping("/sec/rnc/EgovRlnmCnfirm.do")
- public String rlnmCnfirm(Model model, @RequestParam Map commandMap) throws Exception {
-
- model.addAttribute("ihidnum", (String) commandMap.get("ihidnum")); //주민번호
- model.addAttribute("realname", (String) commandMap.get("realname")); //사용자이름
- model.addAttribute("sbscrbTy", (String) commandMap.get("sbscrbTy")); //사용자유형
- model.addAttribute("nextUrlName", (String) commandMap.get("nextUrlName")); //다음단계버튼명(이동할 URL에 따른)
- String nextUrl = (String) commandMap.get("nextUrl");
- if ( nextUrl == null ) nextUrl = "";
- model.addAttribute("nextUrl", nextUrl); //다음단계로 이동할 URL
-
-// if ("".equals((String) commandMap.get("ihidnum"))) {
-// result = "info.user.rlnmCnfirm";
-// model.addAttribute("result", result); //실명확인 결과
-// return "egovframework/com/sec/rnc/EgovRlnmCnfirm";
-// }
-//
-// try {
-// result = rlnmManageService.rlnmCnfirm((String) commandMap.get("ihidnum"), (String) commandMap.get("realname"), (String) commandMap.get("sbscrbTy"));
-// } finally {
-// model.addAttribute("result_tmp", result + "__" + result.substring(0, 2));
-// if (result.substring(0, 2).equals("00")) {
-// result = "success.user.rlnmCnfirm";
-// } else if (result.substring(0, 2).equals("01")) {
-// result = "fail.user.rlnmCnfirm";
-// } else {
-// result = "fail.user.connectFail";
-// }
-// model.addAttribute("result", result); //실명확인 결과
-//
-// }
-
- // 화이트 리스트 처리
- // whitelist목록에 있는 경우 결과가 true, 결과가 false인경우 FAIL처리
- boolean isAuth = false;
-
- for (String urlPattern : nextUrlWhitelist)
- {
- if (nextUrl.matches(urlPattern))
- {
- isAuth = true;
- break;
- }
- }
-
- if (!isAuth) {
- LOGGER.error("nextUrl WhiteList Error! Please check whitelist! ... " + nextUrl);
- nextUrl = "egovframework/com/cmm/egovError";
- }
-
- // 안전한 경로 문자열로 조치
- nextUrl = EgovWebUtil.filePathBlackList(nextUrl);
-
-
-// return "egovframework/com/sec/rnc/EgovRlnmCnfirm";
- // 실명인증기능 미탑재로 바로 회원가입 페이지로 이동.
- return "forward:" + nextUrl;
- }
-
- /**
- * 실명인증확인화면 호출(GPIN)
- * @param model 모델
- * @return "egovframework/com/uss/umt/EgovStplatCnfirm"
- * @exception Exception
- */
- @RequestMapping("/sec/rnc/EgovRlnmPinCnfirm.do")
- public String rlnmPinCnfirm(Model model, @RequestParam Map commandMap, HttpServletRequest request) throws Exception {
- model.addAttribute("sbscrbTy", (String) commandMap.get("sbscrbTy")); //사용자유형
- model.addAttribute("nextUrlName", (String) commandMap.get("nextUrlName")); //다음단계버튼명(이동할 URL에 따른)
- model.addAttribute("nextUrl", (String) commandMap.get("nextUrl")); //다음단계로 이동할 URL
- String realName = (String) commandMap.get("realName"); //결과_최초는 블랭크
- String result = (String) commandMap.get("result"); //결과_최초는 블랭크
-
- LOGGER.debug("realName: {}", realName);
-
- if ("".equals(result) && "".equals(realName)) {
- result = "info.user.rlnmPinCnfirm";
- model.addAttribute("result", result); //실명확인 결과
- } else {
- if (!realName.equals("null") && !realName.equals("")) {
- result = "success.user.rlnmPinCnfirm";
- model.addAttribute("result", result); //실명확인 결과 메시지
- realName = URLDecoder.decode(realName, "UTF-8"); // gpin배포샘플은 기본인코딩이 euc-kr
- model.addAttribute("realName", realName); //실명확인 결과 이름
- //return "forward:"+(String)commandMap.get("nextUrl"); 성공시만 체크하여 직접 다음 URL로 이동할수도 있음
- } else {
- result = "fail.user.rlnmPinCnfirm";
- model.addAttribute("result", result); //실명확인 결과 메시지
- realName = new String(realName.getBytes("UTF-8"), "EUC-KR"); // gpin배포샘플은 기본인코딩이 euc-kr
- model.addAttribute("realName", realName); //실명확인 결과 이름
- }
- }
- LOGGER.debug("result: {}", result);
-
- return "egovframework/com/sec/rnc/EgovRlnmPinCnfirm";
- }
-
- /**
- * 실명인증확인화면 호출(GPIN)
- * @param model 모델
- * @return "egovframework/com/uss/umt/EgovStplatCnfirm"
- * @exception Exception
- */
- @RequestMapping("/sec/rnc/EgovGPinCall.do")
- public String gpinCall(Model model, @RequestParam Map commandMap) throws Exception {
- model.addAttribute("gpinId", (String) commandMap.get("gpinId")); //GPIN 아이디
- model.addAttribute("gpinPassword", (String) commandMap.get("gpinPassword")); //GPIN 패스워드
- model.addAttribute("sbscrbTy", (String) commandMap.get("sbscrbTy")); //사용자유형
- //model.addAttribute("urlName", (String)commandMap.get("urlName")); //다음단계버튼명(이동할 URL에 따른)
- //model.addAttribute("urlInfo", (String)commandMap.get("urlInfo")); //다음단계로 이동할 URL
- model.addAttribute("nextUrlName", (String) commandMap.get("nextUrlName")); //다음단계버튼명(이동할 URL에 따른)
- model.addAttribute("nextUrl", (String) commandMap.get("nextUrl")); //다음단계로 이동할 URL
-
- return "egovframework/com/sec/rnc/gpin/Sample-AuthRequest";
- }
-
- /**
- * validato rule dynamic Javascript
- */
- @RequestMapping("/sec/rnc/validator.do")
- public String validate() {
- return "egovframework/com/cmm/validator";
- }
-
- /**
- * JSP 호출작업만 처리하는 공통 함수
- */
- @RequestMapping(value = "/sec/rnc/EgovPageLink.do")
- public String moveToPage(@RequestParam("link") String linkPage) {
-
- // service 사용하여 리턴할 결과값 처리하는 부분은 생략하고 단순 페이지 링크만 처리함
- String link = linkPage.replace(";", "").replace(".", "");
-
- if (link == null || link.equals("")) {
- link = "egovframework/com/cmm/egovError";
- }
- else
- {
- // 화이트 리스트 처리
- // whitelist목록에 있는 경우 결과가 true, 결과가 false인경우 FAIL처리
- boolean isAuth = false;
-
- for (String urlPattern : egovWhitelist)
- {
- if (link.matches(urlPattern))
- {
- isAuth = true;
- break;
- }
- }
-
- if (!isAuth) {
- LOGGER.error("Page Link WhiteList Error! Please check whitelist!" + link);
- link = "egovframework/com/cmm/egovError";
- }
-
- }
-
- // 안전한 경로 문자열로 조치
- return EgovWebUtil.filePathBlackList(link);
-
- }
-}
\ No newline at end of file
diff --git a/src/main/java/egovframework/com/sts/bst/web/EgovBbsStatsController.java b/src/main/java/egovframework/com/sts/bst/web/EgovBbsStatsController.java
index 4d0eca0e5..78e11c0a4 100644
--- a/src/main/java/egovframework/com/sts/bst/web/EgovBbsStatsController.java
+++ b/src/main/java/egovframework/com/sts/bst/web/EgovBbsStatsController.java
@@ -186,7 +186,7 @@ public String selectBbsStats(@ModelAttribute("statsVO") StatsVO statsVO,
model.addAttribute("bbsMaxNtcrList", bbsMaxNtcrList);
model.addAttribute("statsInfo", statsVO);
}
- if (GenericValidator.isDate(statsVO.getFromDate(), "yyyyMMdd", true)) {
+ if (GenericValidator.isDate(statsVO.getFromDate(), "yyyyMMdd", true)) {
model.addAttribute("fDate", (LocalDate.parse(statsVO.getFromDate(), DateTimeFormatter.BASIC_ISO_DATE).format(DateTimeFormatter.ISO_LOCAL_DATE)));
}
if (GenericValidator.isDate(statsVO.getToDate(), "yyyyMMdd", true)) {
diff --git a/src/main/java/egovframework/com/sts/cst/web/EgovConectStatsController.java b/src/main/java/egovframework/com/sts/cst/web/EgovConectStatsController.java
index 2ec4652c4..fbeec8839 100644
--- a/src/main/java/egovframework/com/sts/cst/web/EgovConectStatsController.java
+++ b/src/main/java/egovframework/com/sts/cst/web/EgovConectStatsController.java
@@ -91,7 +91,7 @@ public String selectUserStats(@ModelAttribute("statsVO") StatsVO statsVO,
model.addAttribute("conectStats", conectStats);
model.addAttribute("statsInfo", statsVO);
}
- if (GenericValidator.isDate(statsVO.getFromDate(), "yyyyMMdd", true)) {
+ if (GenericValidator.isDate(statsVO.getFromDate(), "yyyyMMdd", true)) {
model.addAttribute("fDate", (LocalDate.parse(statsVO.getFromDate(), DateTimeFormatter.BASIC_ISO_DATE).format(DateTimeFormatter.ISO_LOCAL_DATE)));
}
if (GenericValidator.isDate(statsVO.getToDate(), "yyyyMMdd", true)) {
diff --git a/src/main/java/egovframework/com/sts/rst/service/ReprtStats.java b/src/main/java/egovframework/com/sts/rst/service/ReprtStats.java
index 6afdddb22..2cb6c511b 100644
--- a/src/main/java/egovframework/com/sts/rst/service/ReprtStats.java
+++ b/src/main/java/egovframework/com/sts/rst/service/ReprtStats.java
@@ -16,11 +16,12 @@
*
* 수정일 수정자 수정내용
* ------- -------- ---------------------------
- * 2009.8.3 lee.m.j 최초 생성 *
- * 2011.8.26 정진오 IncludedInfo annotation 추가
+ * 2009.8.3 lee.m.j 최초 생성 *
+ * 2011.8.26 정진오 IncludedInfo annotation 추가
*
*
*/
+
public class ReprtStats extends ComDefaultVO {
/** serialVersionUID */
diff --git a/src/main/java/egovframework/com/sym/ccm/acr/service/impl/EgovAdministCodeRecptnServiceImpl.java b/src/main/java/egovframework/com/sym/ccm/acr/service/impl/EgovAdministCodeRecptnServiceImpl.java
index 2e81fbaec..db4c95af8 100644
--- a/src/main/java/egovframework/com/sym/ccm/acr/service/impl/EgovAdministCodeRecptnServiceImpl.java
+++ b/src/main/java/egovframework/com/sym/ccm/acr/service/impl/EgovAdministCodeRecptnServiceImpl.java
@@ -1,33 +1,31 @@
package egovframework.com.sym.ccm.acr.service.impl;
import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.InputStreamReader;
-import java.text.SimpleDateFormat;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
-import java.util.Locale;
-import egovframework.com.cmm.LoginVO;
-import egovframework.com.cmm.service.EgovProperties;
-import egovframework.com.cmm.service.FileSystemUtils;
-import egovframework.com.cmm.util.EgovResourceCloseHelper;
-import egovframework.com.cmm.util.EgovUserDetailsHelper;
-import egovframework.com.sym.ccm.acr.service.AdministCodeRecptn;
-import egovframework.com.sym.ccm.acr.service.AdministCodeRecptnVO;
-import egovframework.com.sym.ccm.acr.service.EgovAdministCodeRecptnService;
+import javax.annotation.Resource;
import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl;
import org.egovframe.rte.fdl.idgnr.EgovIdGnrService;
import org.egovframe.rte.psl.dataaccess.util.EgovMap;
-
-import javax.annotation.Resource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import egovframework.com.cmm.service.EgovProperties;
+import egovframework.com.sym.ccm.acr.service.AdministCodeRecptn;
+import egovframework.com.sym.ccm.acr.service.AdministCodeRecptnVO;
+import egovframework.com.sym.ccm.acr.service.EgovAdministCodeRecptnService;
/**
*
@@ -46,6 +44,7 @@
* 2011.10.07 이기하 finally문을 추가하여 에러시 자원반환할 수 있도록 추가
* 2017.02.08 이정은 시큐어코딩(ES) - 시큐어코딩 부적절한 예외 처리[CWE-253, CWE-440, CWE-754]
* 2022.11.11 김혜준 시큐어코딩 처리
+ * 2023.08.10 정진오 법정동코드수신 방식 수정(공공데이터포털 이용)
*
* Copyright (C) 2009 by MOPAS All right reserved.
*
@@ -53,9 +52,6 @@
@Service("AdministCodeRecptnService")
public class EgovAdministCodeRecptnServiceImpl extends EgovAbstractServiceImpl implements EgovAdministCodeRecptnService {
- /** log */
- private static final Logger LOGGER = LoggerFactory.getLogger(EgovAdministCodeRecptnServiceImpl.class);
-
@Resource(name = "AdministCodeRecptnDAO")
private AdministCodeRecptnDAO administCodeRecptnDAO;
@@ -67,337 +63,173 @@ public class EgovAdministCodeRecptnServiceImpl extends EgovAbstractServiceImpl i
* 법정동코드수신을 처리한다.
*/
public void insertAdministCodeRecptn() throws Exception {
- SimpleDateFormat sDate = new SimpleDateFormat("yyyyMMddHHmm", Locale.getDefault());
- String strdate = sDate.format(new java.util.Date());
-
- String rcvDir = EgovProperties.getProperty("CNTC.INSTTCODE.DIR.rcv");
- String rcvOldDir = EgovProperties.getProperty("CNTC.INSTTCODE.DIR.rcvold");
- String binDir = EgovProperties.getProperty("CNTC.INSTTCODE.DIR.bin");
-
- String rcvListCmd = EgovProperties.getProperty("CNTC.INSTTCODE.CMD.edircv");
- String rcvMesgCmd = EgovProperties.getProperty("CNTC.INSTTCODE.CMD.edircvmsg");
-
- String userId = EgovProperties.getProperty("CNTC.INSTTCODE.INFO.userid");
- String userPw = EgovProperties.getProperty("CNTC.INSTTCODE.INFO.userpw");
-
- String rcvListName = "unSEENlst";
- String CODULD = "CODULD"; // DocCode선언
-
- String rcvListFullCmd = binDir + rcvListCmd;
- String rcvMesgFullCmd = binDir + rcvMesgCmd;
- String rcvListFullName = rcvDir + rcvListName + "." + strdate;
-
- String systemCmdFull = null;
-
- FileInputStream fin = null;
- InputStreamReader sin = null;
- BufferedReader in = null;
-
- File listFile = null;
- File dataFile = null;
-
- File recvOldFile = null;
-
- InputStream is = null;
- BufferedReader br = null;
-
- // 연계목록을 가져온다.
- try {
- systemCmdFull = rcvListFullCmd + " " + userId + " " + userPw + " *UNSEEN *ALL*ALL " + rcvListFullName;
- // 2022.11.11 시큐어코딩 처리
- FileSystemUtils util = new FileSystemUtils();
- Process process = util.processOperate("EgovAdministCodeRecptnService", systemCmdFull);
- is = process.getInputStream();
- br = new BufferedReader(new InputStreamReader(is));
- String tmp;
- String temp = "";
- //KISA 보안약점 조치 (2018-10-29, 윤창원)
- while (true) {
- tmp = br.readLine();
- if (tmp == null) break;
- temp += tmp;
+ List> list = apiLink();
+ for(int i = 0; i < list.size(); i++) {
+ HashMap row = list.get(i);
+ AdministCodeRecptn administCodeRecptn = new AdministCodeRecptn();
+ administCodeRecptn.setOccrrDe(ObjectUtils.isEmpty(row.get("adptDe")) ? "20000101" : row.get("adptDe")); // 날짜 >> adpt_de 생성일 x 20000101
+ administCodeRecptn.setAdministZoneSe("1"); // 행정구역부분 1 법정동 2 행정동
+ administCodeRecptn.setAdministZoneCode(row.get("regionCd")); // 행정구역코드 >> region_cd
+ administCodeRecptn.setOpertSn(idgenService.getNextIntegerId()); // 작업일련번호 >> idgenService.getNextIntegerId()
+ administCodeRecptn.setChangeSeCode("01"); // 변경구분코드 01 코드생성 02 코드변경 03 코드말소 >> 01 / 02
+ administCodeRecptn.setProcessSe("00"); // 작업구분 00 수신처리 01 처리완료 11 생성오류 12 변경오류 13 말소오류>> 00
+ administCodeRecptn.setAdministZoneNm(row.get("locataddNm")); // 행정구역명 >> locatadd_nm 지역주소명
+ administCodeRecptn.setLowestAdministZoneNm(row.get("locallowNm")); // 최하위행정구역명 >> locallow_nm 최하위지역명
+ administCodeRecptn.setCtprvnCode(row.get("sidoCd")); // 시도코드 >> sido_cd 시도코드
+ administCodeRecptn.setSignguCode(row.get("sggCd")); // 시군구코드 >> sgg_cd 시군구코드
+ administCodeRecptn.setEmdCode(row.get("umdCd")); // 읍면동코드 >> umd_cd 읍면동코드
+ administCodeRecptn.setLiCode(row.get("riCd")); // 리코드 >> ri_cd 리코드
+ administCodeRecptn.setCreatDe(row.get("adptDe")); // 생성일자 >> adpt_de 생성일
+ administCodeRecptn.setAblDe(""); // 폐지일자 >> x
+ administCodeRecptn.setAblEnnc(""); // 폐지유무 >> x
+ administCodeRecptn.setFrstRegisterId("Batch System"); // 등록자 Batch System
+ administCodeRecptn.setLastUpdusrId("Batch System"); // 수정자 Batch System
+
+ AdministCodeRecptnVO vo = new AdministCodeRecptnVO();
+ vo.setSearchCondition("CodeList");
+ vo.setAdministZoneSe("1");
+ vo.setAdministZoneCode(row.get("regionCd"));
+ int count = administCodeRecptnDAO.selectAdministCodeRecptnListTotCnt(vo);
+ if (count > 0) {
+ administCodeRecptnDAO.updateAdministCode(administCodeRecptn);
+ } else {
+ administCodeRecptnDAO.insertAdministCodeRecptn(administCodeRecptn);
+ administCodeRecptnDAO.insertAdministCode(administCodeRecptn);
}
+ }
+ }
- egovLogger.debug("List command console output : {}", temp);
+ /**
+ * 법정동코드를 수신하기 위한 요청을 설정한다.
+ */
+ public static String requestString(int pageNo, int numOfRows) throws IOException {
+ String serviceKey = EgovProperties.getProperty("Globals.data.serviceKey");
+ StringBuilder sb = new StringBuilder();
+ sb.append("https://apis.data.go.kr/1741000/StanReginCd/getStanReginCdList"); /*URL*/
+ sb.append("?" + URLEncoder.encode("serviceKey","UTF-8") + "=" + serviceKey); /*Service Key*/
+ sb.append("&" + URLEncoder.encode("pageNo","UTF-8") + "=" + URLEncoder.encode(Integer.toString(pageNo), "UTF-8")); /*페이지번호*/
+ sb.append("&" + URLEncoder.encode("numOfRows","UTF-8") + "=" + URLEncoder.encode(Integer.toString(numOfRows), "UTF-8")); /*한 페이지 결과 수*/
+ sb.append("&" + URLEncoder.encode("type","UTF-8") + "=" + URLEncoder.encode("JSON", "UTF-8")); /*요청자료형식(XML/JSON) Default: XML*/
+ sb.append("&" + URLEncoder.encode("locatadd_nm","UTF-8") + "=" + URLEncoder.encode("서울특별시", "UTF-8")); /*지역주소명(옵션)*/
+ return sb.toString();
+ }
- } catch (IOException e) {
- egovLogger.error("IO Exception", e);
- throw e;
- } finally {
- EgovResourceCloseHelper.close(br, is);
- }
+ /**
+ * 법정동코드 페이지수를 확인한다.
+ */
+ public static int numberOfRows() throws IOException, ParseException {
+ int pageNo = 1;
+
+ String requestString = requestString(1, 1);
+
+ URL url = new URL(requestString);
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("GET");
+ conn.setRequestProperty("Content-Type", "application/json");
+ conn.setRequestProperty("Accept", "*/*;q=0.9");
+ conn.setDoOutput(true);
+ conn.setUseCaches(false);
+
+ BufferedReader br;
+ if (conn.getResponseCode() >= 200 && conn.getResponseCode() <= 300) {
+
+ br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+ StringBuilder sb = new StringBuilder();
+ String line;
+ while ((line = br.readLine()) != null) {
+ sb.append(line);
+ }
+ br.close();
+
+ JSONParser jsonParser = new JSONParser();
+ JSONObject jsonObject = (JSONObject) jsonParser.parse(sb.toString());
+ JSONArray jsonArray = (JSONArray) jsonObject.get("StanReginCd");
+ JSONObject headObject = (JSONObject) jsonArray.get(0);
+ JSONArray headArray = (JSONArray) headObject.get("head");
+ JSONObject object = (JSONObject) headArray.get(0);
+ int totalCount = Integer.parseInt(object.get("totalCount").toString());
+ pageNo = (int) Math.ceil((double) totalCount/1000);
+
+ } else {
+ System.out.println("##### AdministCodeRecptnService.numberOfRows() Error Code >>> " + conn.getResponseCode());
+ }
+
+ conn.disconnect();
+
+ return pageNo;
+ }
- // 연계목록을 확인하여 연계파일을 가져온다.
- try {
- listFile = new File(rcvListFullName);
-
- if (listFile.exists()) {
- fin = new FileInputStream(listFile);
- sin = new InputStreamReader(fin);
- in = new BufferedReader(sin);
-
- String readList = null;
- int listCount = 0;
-
- // 연계목록을 확인
- //KISA 보안약점 조치 (2018-10-29, 윤창원)
- while (true) {
- readList = in.readLine();
- if (readList == null) {
- break;
- }
-
- listCount++;
-
- if (listCount < 5) {
- continue;
- }
-
- String messageID = null; // messageID
- String docCode = null; // DocCode
- String fileID = null; // fileID
-
- messageID = readList.substring(0, 20);
- fileID = readList.substring(20, readList.indexOf(" "));
- docCode = readList.substring(50, 56);
-
- if (CODULD.equals(docCode)) {
- // 연계파일을 가져온다.
- try {
- systemCmdFull = rcvMesgFullCmd + " " + userId + " " + userPw + " " + messageID + " *ALL*ALL " + rcvDir + fileID;
- // 2022.11.11 시큐어코딩 처리
- FileSystemUtils util = new FileSystemUtils();
- Process process = util.processOperate("EgovAdministCodeRecptnService", systemCmdFull);
- is = process.getInputStream();
- br = new BufferedReader(new InputStreamReader(is));
- String tmp;
- String temp = "";
- //KISA 보안약점 조치 (2018-10-29, 윤창원)
- while (true) {
- tmp = br.readLine();
- if (tmp == null) {
- break;
- }
- temp += tmp;
- }
-
- egovLogger.debug("Message command console output : {}", temp);
-
- } finally {
- EgovResourceCloseHelper.close(br, is);
- }
- }
- }
-
- EgovResourceCloseHelper.close(in);
-
- // 연계파일 수신이 완료되면 listFile:=rcvListFullName 파일을 recvOldFileDir 로 이동한다.
- recvOldFile = new File(rcvOldDir + listFile.getName());
- if (listFile.isFile()) {
- if (recvOldFile.getParentFile() != null) {//KISA 보안약점 조치 (2018-10-29, 윤창원)
- if (recvOldFile.getParentFile().isDirectory()) {
- //2017.02.08 이정은 시큐어코딩(ES)-부적절한 예외 처리[CWE-253, CWE-440, CWE-754]
- if(listFile.renameTo(recvOldFile)){
- LOGGER.debug("[file.renameTo] listFile : File Rename Successs ");
- }else{
- LOGGER.error("[file.renameTo] listFile : File Rename Fail ");
- }
- }
- }
- } else {
- // 진행종료
- processException("recvList filename or rcvold path is not valid!!!");
- }
- }
- } catch (IOException e) {
- egovLogger.error("IOException", e);
- throw e;
- } finally {
- EgovResourceCloseHelper.close(fin, sin, in);
+ /**
+ * 법정동코드를 수신한다.
+ */
+ public static List> apiLink() throws IOException, ParseException {
+ List> administCodeList = new ArrayList<>();
+
+ int pageNo = 1;
+ int numOfRows = 1000;
+
+ pageNo = numberOfRows();
+
+ for (int p = 1; p <= pageNo; p++) {
+
+ String requestString = requestString(p, numOfRows);
+
+ URL url = new URL(requestString);
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("GET");
+ conn.setRequestProperty("Content-Type", "application/json");
+ conn.setRequestProperty("Accept", "*/*;q=0.9");
+ conn.setDoOutput(true);
+ conn.setUseCaches(false);
+
+ BufferedReader br;
+ if (conn.getResponseCode() >= 200 && conn.getResponseCode() <= 300) {
+
+ br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+ StringBuilder sb = new StringBuilder();
+ String line;
+ while ((line = br.readLine()) != null) {
+ sb.append(line);
+ }
+ br.close();
+
+ JSONParser jsonParser = new JSONParser();
+ JSONObject jsonObject = (JSONObject) jsonParser.parse(sb.toString());
+ JSONArray jsonArray = (JSONArray) jsonObject.get("StanReginCd");
+ JSONObject bodyObject = (JSONObject) jsonArray.get(1);
+ JSONArray row = (JSONArray) bodyObject.get("row");
+
+ for (int r = 0; r < row.size(); r++) {
+ JSONObject object = (JSONObject) row.get(r);
+ HashMap administCode = new HashMap<>();
+ administCode.put("regionCd", stringValueOf(object.get("region_cd")));
+ administCode.put("sidoCd", stringValueOf(object.get("sido_cd")));
+ administCode.put("sggCd", stringValueOf(object.get("sgg_cd")));
+ administCode.put("umdCd", stringValueOf(object.get("umd_cd")));
+ administCode.put("riCd", stringValueOf(object.get("ri_cd")));
+ administCode.put("locatjuminCd", stringValueOf(object.get("locatjumin_cd")));
+ administCode.put("locatjijukCd", stringValueOf(object.get("locatjijuk_cd")));
+ administCode.put("locataddNm", stringValueOf(object.get("locatadd_nm")));
+ administCode.put("locatOrder", stringValueOf(object.get("locat_order")));
+ administCode.put("locatRm", stringValueOf(object.get("locat_rm")));
+ administCode.put("locathighCd", stringValueOf(object.get("locathigh_cd")));
+ administCode.put("locallowNm", stringValueOf(object.get("locallow_nm")));
+ administCode.put("adptDe", stringValueOf(object.get("adpt_de")));
+ administCodeList.add(administCode);
+ }
+
+ } else {
+ System.out.println("##### AdministCodeRecptnService.apiLink() Error Code >>> " + conn.getResponseCode());
+ }
+
+ conn.disconnect();
}
- // 수신디렉토리의 모든 연계파일을 확인하여 연계정보를 처리한다.
- String buf = "";
- //String buf2[] = null;
-
- File recvFileDir = new File(rcvDir);
- File recvFileList[] = recvFileDir.listFiles();
-
- int fileCount = 0;
-
- // 2022.11.11 시큐어코딩 처리
- if (recvFileList != null) {
-
- do {
- if (recvFileList[fileCount] == null) {//KISA 보안약점 조치 (2018-10-29, 윤창원)
- fileCount++;
- continue;
- }
-
- if (recvFileList[fileCount].getName().indexOf(".rec") > -1) {
- dataFile = new File(recvFileList[fileCount].getPath());
- } else {
- fileCount++;
- continue;
- }
-
- buf += "\n\n++++++++++++++++++++++++++++++++++++++++++++++++++++\n";
-
- String readData = null;
-
- try {
- if (dataFile.exists()) {
-
- fin = new FileInputStream(dataFile);
- sin = new InputStreamReader(fin);
- in = new BufferedReader(sin);
- //KISA 보안약점 조치 (2018-10-29, 윤창원)
- while (true) {
- readData = in.readLine();
- if (readData == null) {
- break;
- }
-
- AdministCodeRecptn administCodeRecptn = new AdministCodeRecptn();
-
- String tokenData[] = readData.split(" ", 12);
- int tokenLength = tokenData.length;
-
- String strTmp = null;
- for (int i = 0; i < tokenLength; i++) {
- strTmp = tokenData[i].trim();
- tokenData[i] = strTmp;
- }
-
- buf += "\n\n++++++++++++++++++++++++++++++++++++++++++++++++++++\n";
- buf += "tokenLength" + Integer.toString(tokenLength);
-
- if (tokenLength >= 12) {
- // 마지막 문자 ';' 제거
- tokenData[tokenLength - 1] = tokenData[tokenLength - 1].replace(";", "").trim();
-
- buf += "\n" + "[ F]" + dataFile.getName() // 파일명
- + "\n";
-
- // 명령 변경구분코드로 변환
- strTmp = "INS".equals(tokenData[0]) ? "01" : ("UPD".equals(tokenData[0]) ? "02" : ("DEL".equals(tokenData[0]) ? "03" : ""));
-
- // 기본셋팅
- administCodeRecptn.setAdministZoneSe("1"); // 행정구역구분 1.법정동; 2.행정동
-
- // 실제 연계 항목 Mapping 작업
- administCodeRecptn.setChangeSeCode(strTmp); // 명령 :: 변경구분코드
- administCodeRecptn.setOccrrDe(tokenData[1]); // 날짜 :: 발생일자
- administCodeRecptn.setAdministZoneCode(tokenData[2]); // 행정구역코드 :: 행정구역코드
- administCodeRecptn.setAdministZoneNm(tokenData[7]); // 행정구역명 :: 행정구역명
- administCodeRecptn.setLowestAdministZoneNm(tokenData[8]); // 최하위행정구역명 :: 최하위행정구역명
- administCodeRecptn.setCtprvnCode(tokenData[3]); // 시도코드 :: 시도코드
- administCodeRecptn.setSignguCode(tokenData[4]); // 시군구코드 :: 시군구코드
- administCodeRecptn.setEmdCode(tokenData[5]); // 읍면동코드 :: 읍면동코드
- administCodeRecptn.setLiCode(tokenData[6]); // 리코드 :: 리코드
- administCodeRecptn.setCreatDe(tokenData[9]); // 생성일자 :: 생성일자
- administCodeRecptn.setAblDe(tokenData[10]); // 폐지일자 :: 폐지일자
- administCodeRecptn.setAblEnnc(tokenData[11]); // 폐지유무 :: 폐지유무
- administCodeRecptn.setUseAt(tokenData[11]); // 폐지유무 :: 폐지유무
-
- // 작업일자
- if (administCodeRecptn.getOccrrDe().equals("") || administCodeRecptn.getOccrrDe() == null) {
- administCodeRecptn.setOccrrDe(strdate.substring(0, 8));
- }
-
- // 상위기관코드 계산
- String upperCode = administCodeRecptn.getSignguCode().equals("000") ? "" : (administCodeRecptn.getEmdCode().equals("000") ? administCodeRecptn
- .getCtprvnCode() + "000" + "000" + "00" : (administCodeRecptn.getLiCode().equals("00") ? administCodeRecptn.getCtprvnCode()
- + administCodeRecptn.getSignguCode() + "000" + "00" : administCodeRecptn.getCtprvnCode() + administCodeRecptn.getSignguCode()
- + administCodeRecptn.getEmdCode() + "00"));
- administCodeRecptn.setUpperAdministZoneCode(upperCode);
-
- // 작업일련번호 확인 Generation
- int iOpertSn = idgenService.getNextIntegerId();
- administCodeRecptn.setOpertSn(iOpertSn);
-
- buf += "\n-all--------------\n";
-
- for (int i = 0; i < tokenLength; i++) {
- buf += "SPLIT [" + Integer.toString(tokenData[i].length()) + "]>>>>>> " + Integer.toString(i) + " : [" + tokenData[i] + "]\n";
- }
-
- } else {
-
- LOGGER.debug("\n\n*****************************************************************");
- LOGGER.debug(buf);
- LOGGER.debug("\n\n*****************************************************************");
- LOGGER.debug(readData);
-
- continue;
- }
- LOGGER.debug("\n\n*****************************************************************");
- LOGGER.debug("\n\n*****************************************************************");
- LOGGER.debug(buf);
-
- buf += "\n---------------\n";
-
- // 로그인VO에서 사용자 정보 가져오기
- LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
- String uniqId = loginVO.getUniqId();
- administCodeRecptn.setFrstRegisterId(uniqId);
- administCodeRecptn.setLastUpdusrId(uniqId);
-
- // changeSeCode 변경구분코드
- // '01' 코드생성
- // '02' 코드변경
- // '03' 코드말소
-
- // processSe 처리구분
- // '00' 수신처리
- // '01' 처리완료
- // '11' 생성오류
- // '12' 변경오류
- // '13' 말소오류
-
- // 작업구분 - 수신
- administCodeRecptn.setProcessSe("00");
- administCodeRecptnDAO.insertAdministCodeRecptn(administCodeRecptn);
-
- // 작업구분 - 처리
- administCodeRecptn.setProcessSe("01");
- if ("01".equals(administCodeRecptn.getChangeSeCode())) {
- // 코드생성
- administCodeRecptnDAO.insertAdministCode(administCodeRecptn);
- } else if ("02".equals(administCodeRecptn.getChangeSeCode())) {
- // 코드변경
- administCodeRecptnDAO.updateAdministCode(administCodeRecptn);
- } else if ("03".equals(administCodeRecptn.getChangeSeCode())) {
- // 코드말소
- administCodeRecptnDAO.deleteAdministCode(administCodeRecptn);
- }
- }
- EgovResourceCloseHelper.close(in);
-
- // 연계파일 수신이 완료되면 dataFile 파일을 recvOldFileDir 로 이동한다.
- recvOldFile = new File(rcvOldDir + dataFile.getName());
- if (dataFile.isFile()) {
- if (recvOldFile.getParentFile() != null) {//KISA 보안약점 조치 (2018-10-29, 윤창원)
- if (recvOldFile.getParentFile().isDirectory()) {
- dataFile.renameTo(recvOldFile);
- }
- }
- } else {
- // 진행종료
- processException("dataFile filename or rcvold path is not valid!!!");
- //throw new Exception("dataFile filename or rcvold path is not valid!!!");
- }
- }
- } catch (IOException e) {
- LOGGER.error("IO Exception", e);
- } finally {
- EgovResourceCloseHelper.close(in);
-
- fileCount++;
- }
-
- } while (fileCount < recvFileList.length);
- }
+ return administCodeList;
+ }
+
+ private static String stringValueOf(Object object) {
+ return object == null ? "" : String.valueOf(object);
}
/**
diff --git a/src/main/java/egovframework/com/sym/ccm/cca/web/EgovCcmCmmnCodeManageController.java b/src/main/java/egovframework/com/sym/ccm/cca/web/EgovCcmCmmnCodeManageController.java
index e97379e4a..f933b2ee0 100644
--- a/src/main/java/egovframework/com/sym/ccm/cca/web/EgovCcmCmmnCodeManageController.java
+++ b/src/main/java/egovframework/com/sym/ccm/cca/web/EgovCcmCmmnCodeManageController.java
@@ -135,7 +135,7 @@ public String insertCmmnCodeView(@ModelAttribute("cmmnCodeVO")CmmnCodeVO cmmnCod
CmmnClCodeVO searchVO = new CmmnClCodeVO();
searchVO.setFirstIndex(0);
List clCodeList = cmmnClCodeManageService.selectCmmnClCodeList(searchVO);
-
+
model.addAttribute("clCodeList", clCodeList);
return "egovframework/com/sym/ccm/cca/EgovCcmCmmnCodeRegist";
@@ -158,15 +158,15 @@ public String insertCmmnCode(@ModelAttribute("searchVO") CmmnCodeVO cmmnCode, @M
LoginVO user = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
CmmnClCodeVO searchVO = new CmmnClCodeVO();
- searchVO.setFirstIndex(0);
+ searchVO.setFirstIndex(0);
beanValidator.validate(cmmnCodeVO, bindingResult);
if (bindingResult.hasErrors()) {
- List clCodeList = cmmnClCodeManageService.selectCmmnClCodeList(searchVO);
- model.addAttribute("clCodeList", clCodeList);
-
+ List clCodeList = cmmnClCodeManageService.selectCmmnClCodeList(searchVO);
+ model.addAttribute("clCodeList", clCodeList);
+
return "egovframework/com/sym/ccm/cca/EgovCcmCmmnCodeRegist";
}
@@ -175,9 +175,9 @@ public String insertCmmnCode(@ModelAttribute("searchVO") CmmnCodeVO cmmnCode, @M
if(vo != null){
model.addAttribute("message", egovMessageSource.getMessage("comSymCcmCca.validate.codeCheck"));
- List clCodeList = cmmnClCodeManageService.selectCmmnClCodeList(searchVO);
+ List clCodeList = cmmnClCodeManageService.selectCmmnClCodeList(searchVO);
model.addAttribute("clCodeList", clCodeList);
-
+
return "egovframework/com/sym/ccm/cca/EgovCcmCmmnCodeRegist";
}
}
diff --git a/src/main/java/egovframework/com/sym/ccm/ccc/service/impl/CmmnClCodeManageDAO.java b/src/main/java/egovframework/com/sym/ccm/ccc/service/impl/CmmnClCodeManageDAO.java
index 2893d3fc8..05d379463 100644
--- a/src/main/java/egovframework/com/sym/ccm/ccc/service/impl/CmmnClCodeManageDAO.java
+++ b/src/main/java/egovframework/com/sym/ccm/ccc/service/impl/CmmnClCodeManageDAO.java
@@ -29,9 +29,9 @@
*/
@Repository("CmmnClCodeManageDAO")
public class CmmnClCodeManageDAO extends EgovComAbstractDAO {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(CmmnClCodeManageDAO.class);
-
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(CmmnClCodeManageDAO.class);
+
/**
* 공통분류코드 총 개수를 조회한다.
* @param searchVO
@@ -66,8 +66,8 @@ public CmmnClCode selectCmmnClCodeDetail(CmmnClCode cmmnClCode) throws Exception
* @throws Exception
*/
public void insertCmmnClCode(CmmnClCodeVO cmmnClCodeVO) throws Exception{
- LOGGER.info("TEST5 : 등록 DAO");
- insert("CmmnClCodeManage.insertCmmnClCode", cmmnClCodeVO);
+ LOGGER.info("TEST5 : 등록 DAO");
+ insert("CmmnClCodeManage.insertCmmnClCode", cmmnClCodeVO);
}
/**
diff --git a/src/main/java/egovframework/com/sym/ccm/icr/service/impl/EgovInsttCodeRecptnServiceImpl.java b/src/main/java/egovframework/com/sym/ccm/icr/service/impl/EgovInsttCodeRecptnServiceImpl.java
index a0bbbcf2d..f563b2044 100644
--- a/src/main/java/egovframework/com/sym/ccm/icr/service/impl/EgovInsttCodeRecptnServiceImpl.java
+++ b/src/main/java/egovframework/com/sym/ccm/icr/service/impl/EgovInsttCodeRecptnServiceImpl.java
@@ -1,33 +1,31 @@
package egovframework.com.sym.ccm.icr.service.impl;
import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.InputStreamReader;
-import java.text.SimpleDateFormat;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
-import java.util.Locale;
-import egovframework.com.cmm.LoginVO;
-import egovframework.com.cmm.service.EgovProperties;
-import egovframework.com.cmm.service.FileSystemUtils;
-import egovframework.com.cmm.util.EgovResourceCloseHelper;
-import egovframework.com.cmm.util.EgovUserDetailsHelper;
-import egovframework.com.sym.ccm.icr.service.EgovInsttCodeRecptnService;
-import egovframework.com.sym.ccm.icr.service.InsttCodeRecptn;
-import egovframework.com.sym.ccm.icr.service.InsttCodeRecptnVO;
+import javax.annotation.Resource;
import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl;
import org.egovframe.rte.fdl.idgnr.EgovIdGnrService;
import org.egovframe.rte.psl.dataaccess.util.EgovMap;
-
-import javax.annotation.Resource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import egovframework.com.cmm.service.EgovProperties;
+import egovframework.com.sym.ccm.icr.service.EgovInsttCodeRecptnService;
+import egovframework.com.sym.ccm.icr.service.InsttCodeRecptn;
+import egovframework.com.sym.ccm.icr.service.InsttCodeRecptnVO;
/**
*
@@ -47,14 +45,13 @@
* 2011.10.07 이기하 finally문을 추가하여 에러시 자원반환할 수 있도록 추가
* 2017.02.08 이정은 시큐어코딩(ES) - 시큐어코딩 부적절한 예외 처리[CWE-253, CWE-440, CWE-754]
* 2022.11.11 김혜준 시큐어코딩 처리
- *
+ * 2023.08.10 정진오 기관코드수신 방식 수정(공공데이터포털 이용)
+ *
* Copyright (C) 2009 by MOPAS All right reserved.
*
*/
@Service("InsttCodeRecptnService")
public class EgovInsttCodeRecptnServiceImpl extends EgovAbstractServiceImpl implements EgovInsttCodeRecptnService {
- /** log */
- private static final Logger LOGGER = LoggerFactory.getLogger(EgovInsttCodeRecptnServiceImpl.class);
@Resource(name = "InsttCodeRecptnDAO")
private InsttCodeRecptnDAO insttCodeRecptnDAO;
@@ -67,340 +64,194 @@ public class EgovInsttCodeRecptnServiceImpl extends EgovAbstractServiceImpl impl
* 기관코드수신을 처리한다.
*/
public void insertInsttCodeRecptn() throws Exception {
- SimpleDateFormat sDate = new SimpleDateFormat("yyyyMMddHHmm", Locale.getDefault());
- String strdate = sDate.format(new java.util.Date());
-
- String rcvDir = EgovProperties.getProperty("CNTC.INSTTCODE.DIR.rcv");
- String rcvOldDir = EgovProperties.getProperty("CNTC.INSTTCODE.DIR.rcvold");
- String binDir = EgovProperties.getProperty("CNTC.INSTTCODE.DIR.bin");
-
- String rcvListCmd = EgovProperties.getProperty("CNTC.INSTTCODE.CMD.edircv");
- String rcvMesgCmd = EgovProperties.getProperty("CNTC.INSTTCODE.CMD.edircvmsg");
-
- String userId = EgovProperties.getProperty("CNTC.INSTTCODE.INFO.userid");
- String userPw = EgovProperties.getProperty("CNTC.INSTTCODE.INFO.userpw");
-
- String rcvListName = "unSEENlst";
- String CODUCH = "CODUCH"; // DocCode선언
-
- String rcvListFullCmd = binDir + rcvListCmd;
- String rcvMesgFullCmd = binDir + rcvMesgCmd;
- String rcvListFullName = rcvDir + rcvListName + "." + strdate;
-
- String systemCmdFull = null;
-
- FileInputStream fin = null;
- InputStreamReader sin = null;
- BufferedReader in = null;
-
- File listFile = null;
- File dataFile = null;
-
- File recvOldFile = null;
-
- InputStream is = null;
- BufferedReader br = null;
-
- // 연계목록을 가져온다.
- try {
- systemCmdFull = rcvListFullCmd + " " + userId + " " + userPw + " *UNSEEN *ALL*ALL " + rcvListFullName;
- // 2022.11.11 시큐어코딩 처리
- FileSystemUtils util = new FileSystemUtils();
- Process process = util.processOperate("EgovInsttCodeRecptnService", systemCmdFull);
-
- is = process.getInputStream();
- br = new BufferedReader(new InputStreamReader(is));
-
- String tmp;
- String temp = "";
- tmp = br.readLine();
- while (tmp != null) {
- temp += tmp;
- tmp = br.readLine();
+ List> list = apiLink();
+ for(int i = 0; i < list.size(); i++) {
+ HashMap row = list.get(i);
+ InsttCodeRecptn insttCodeRecptn = new InsttCodeRecptn();
+ insttCodeRecptn.setOccrrDe(ObjectUtils.isEmpty(row.get("crtDe")) ? "20000101" : row.get("crtDe")); // 날짜 >> crt_de 생성일 x 20000101
+ insttCodeRecptn.setInsttCode(row.get("orgCd")); // 기관코드 >> org_cd 기관코드
+ insttCodeRecptn.setOpertSn(idgenService.getNextIntegerId()); // 작업일련번호 >> idgenService.getNextIntegerId()
+ insttCodeRecptn.setChangeSeCode("01"); // 변경구분코드 01 코드생성 02 코드변경 03 코드말소 >> 01 / 02
+ insttCodeRecptn.setProcessSe("00"); // 작업구분 00 수신처리 01 처리완료 11 생성오류 12 변경오류 13 말소오류>> 00
+ insttCodeRecptn.setEtcCode(row.get("locatstdCd")); // 기타코드 >> locatstd_cd 소재지코드
+ insttCodeRecptn.setAllInsttNm(row.get("fullNm")); // 전체기관명 >> full_nm 기관명전체
+ insttCodeRecptn.setLowestInsttNm(row.get("lowNm")); // 최하위기관명 >> low_nm 기관명최하위
+ insttCodeRecptn.setInsttAbrvNm(row.get("abbrNm")); // 기관약칭명 >> abbr_nm 기관명약어
+ insttCodeRecptn.setOdr(row.get("gapNo")); // 차수 >> gap_no 차수
+ insttCodeRecptn.setOrd(row.get("rankNo")); // 서열 >> rank_no 서열
+ insttCodeRecptn.setInsttOdr(row.get("subChasu")); // 소속기관차수 >> sub_chasu 소속기관차수
+ insttCodeRecptn.setUpperInsttCode(row.get("highCd")); // 차상위기관코드 >> high_cd 상위기관코드
+ insttCodeRecptn.setBestInsttCode(row.get("highstCd")); // 최상위기관코드 >> highst_cd 최상위기관코드
+ insttCodeRecptn.setReprsntInsttCode(row.get("repCd")); // 대표기관코드 >> rep_cd 대표기관코드
+ insttCodeRecptn.setInsttTyLclas(row.get("typebigNm")); // 기관유형(대) >> typebig_nm 기관대분류
+ insttCodeRecptn.setInsttTyMclas(row.get("typemidNm")); // 기관유형(중) >> typemid_nm 기관중분류
+ insttCodeRecptn.setInsttTySclas(row.get("typesmlNm")); // 기관유형(소) >> typesml_nm 기관소분류
+ insttCodeRecptn.setTelno(""); // 전화번호 >> x
+ insttCodeRecptn.setFxnum(""); // 팩스번호 >> x
+ insttCodeRecptn.setCreatDe(row.get("crtDe")); // 생성일자 >> crt_de 생성일
+ insttCodeRecptn.setAblDe(row.get("clsDe")); // 폐지일자 >> cls_de 폐지일
+ insttCodeRecptn.setAblEnnc(row.get("stopSelt")); // 폐지구분 >> stop_selt 폐지구분
+ insttCodeRecptn.setChangede(row.get("chgDe")); // 변경일자 >> chg_de 변경일
+ insttCodeRecptn.setChangeTime(""); // 변경시간 >> x
+ insttCodeRecptn.setBsisDe(row.get("baseDate")); // 기초날짜 >> base_date 기초일자
+ insttCodeRecptn.setSortOrdr(0); // 정렬순서 >> x
+ insttCodeRecptn.setFrstRegisterId("System Batch"); // 등록자 Batch System
+ insttCodeRecptn.setLastUpdusrId("System Batch"); // 수정자 Batch System
+
+ InsttCodeRecptnVO vo = new InsttCodeRecptnVO();
+ vo.setSearchCondition("CodeList");
+ vo.setInsttCode(row.get("orgCd"));
+ int count = insttCodeRecptnDAO.selectInsttCodeRecptnListTotCnt(vo);
+ if (count > 0) {
+ insttCodeRecptnDAO.updateInsttCode(insttCodeRecptn);
+ } else {
+ insttCodeRecptnDAO.insertInsttCodeRecptn(insttCodeRecptn);
+ insttCodeRecptnDAO.insertInsttCode(insttCodeRecptn);
}
- egovLogger.debug("List command console output : {}", temp);
-
- } finally {
- EgovResourceCloseHelper.close(br, is);
}
+ }
- // 연계목록을 확인하여 연계파일을 가져온다.
- try {
- listFile = new File(rcvListFullName);
-
- if (listFile.exists()) {
- fin = new FileInputStream(listFile);
- sin = new InputStreamReader(fin);
- in = new BufferedReader(sin);
-
- String readList = null;
- int listCount = 0;
-
- // 연계목록을 확인
- readList = in.readLine();
- while (readList != null) {
- listCount++;
- readList = in.readLine();
- if (listCount < 4 || readList == null) {
-
- continue;
- }
-
- String messageID = null; // messageID
- String docCode = null; // DocCode
- String fileID = null; // fileID
-
- if (readList.length() > 56) { //기관코드 리스트 수신 row가 56자보다 긴지 점검
- messageID = readList.substring(0, 20);
- fileID = readList.substring(20, readList.indexOf(" "));
- docCode = readList.substring(50, 56);
-
- if (CODUCH.equals(docCode)) {
- // 연계파일을 가져온다.
- try {
- systemCmdFull = rcvMesgFullCmd + " " + userId + " " + userPw + " " + messageID + " *ALL*ALL " + rcvDir + fileID;
- // 2022.11.11 시큐어코딩 처리
- FileSystemUtils util = new FileSystemUtils();
- Process process = util.processOperate("EgovInsttCodeRecptnService", systemCmdFull);
-
- is = process.getInputStream();
- br = new BufferedReader(new InputStreamReader(is));
-
- String tmp;
- String temp = "";
- tmp = br.readLine();
- while (tmp != null) {
- temp += tmp;
- tmp = br.readLine();
- }
-
- egovLogger.debug("Message command console output : {}", temp);
- } finally {
- EgovResourceCloseHelper.close(br, is);
- }
- }
- }
-
- }
- EgovResourceCloseHelper.close(in);
-
- // 연계파일 수신이 완료되면 listFile:=rcvListFullName 파일을 recvOldFileDir 로 이동한다.
- recvOldFile = new File(rcvOldDir + listFile.getName());
- if (listFile.isFile()) {
- if (recvOldFile.getParentFile() != null) {//KISA 보안약점 조치 (2018-10-29, 윤창원)
- if (recvOldFile.getParentFile().isDirectory()) {
- //2017.02.08 이정은 시큐어코딩(ES)-부적절한 예외 처리[CWE-253, CWE-440, CWE-754]
- if(listFile.renameTo(recvOldFile)){
- LOGGER.debug("[file.renameTo] listFile : File Rename Successs ");
- }else{
- LOGGER.error("[file.renameTo] listFile : File Rename Fail ");
- }
- }
- }
- } else {
- // 진행종료
- processException("recvList filename or rcvold path is not valid!!!");
- //throw new Exception("recvList filename or rcvold path is not valid!!!");
- }
- }
- } catch (IOException e) {
- egovLogger.error("IOException", e);
- throw e;
- } finally {
- EgovResourceCloseHelper.close(in);
- }
+ /**
+ * 기관코드를 수신하기 위한 요청을 설정한다.
+ */
+ public static String requestString(int pageNo, int numOfRows) throws IOException {
+ String serviceKey = EgovProperties.getProperty("Globals.data.serviceKey");
+ StringBuilder sb = new StringBuilder();
+ sb.append("http://apis.data.go.kr/1741000/StanOrgCd2/getStanOrgCdList2"); /*URL*/
+ sb.append("?" + URLEncoder.encode("serviceKey","UTF-8") + "=" + serviceKey); /*Service Key*/
+ sb.append("&" + URLEncoder.encode("pageNo","UTF-8") + "=" + URLEncoder.encode(Integer.toString(pageNo), "UTF-8")); /*페이지번호*/
+ sb.append("&" + URLEncoder.encode("numOfRows","UTF-8") + "=" + URLEncoder.encode(Integer.toString(numOfRows), "UTF-8")); /*한 페이지 결과 수*/
+ sb.append("&" + URLEncoder.encode("type","UTF-8") + "=" + URLEncoder.encode("JSON", "UTF-8")); /*요청자료형식(XML/JSON) Default: XML*/
+ sb.append("&" + URLEncoder.encode("full_nm","UTF-8") + "=" + URLEncoder.encode("행정안전부", "UTF-8")); /*기관명(옵션)*/
+ sb.append("&" + URLEncoder.encode("stop_selt","UTF-8") + "=" + URLEncoder.encode("0", "UTF-8")); /*사용:0, 폐지:1(옵션)*/
+ return sb.toString();
+ }
- // 수신디렉토리의 모든 연계파일을 확인하여 연계정보를 처리한다.
- String buf = "";
- //String buf2[] = null;
-
- File recvFileDir = new File(rcvDir);
- File recvFileList[] = recvFileDir.listFiles();
-
- int fileCount = 0;
-
- // 2022.11.11 시큐어코딩 처리
- if (recvFileList != null) {
-
- do {
- if (recvFileList[fileCount] == null) {//KISA 보안약점 조치 (2018-10-29, 윤창원)
- fileCount++;
- continue;
- }
-
- if (recvFileList[fileCount].getName().indexOf(".rec") > -1) {
- dataFile = new File(recvFileList[fileCount].getPath());
-
- } else {
- fileCount++;
- continue;
- }
-
- buf += "\n\n++++++++++++++++++++++++++++++++++++++++++++++++++++\n";
-
- String readData = null;
-
- try {
- if (dataFile.exists()) {
-
- fin = new FileInputStream(dataFile);
- sin = new InputStreamReader(fin);
- in = new BufferedReader(sin);
- readData = in.readLine();
- while (readData != null) {
-
- InsttCodeRecptn insttCodeRecptn = new InsttCodeRecptn();
-
- String tokenData[] = readData.split(" ", 25);
- int tokenLength = tokenData.length;
-
- String strTmp = null;
- for (int i = 0; i < tokenLength; i++) {
- strTmp = tokenData[i].trim();
- tokenData[i] = strTmp;
- }
-
- if (tokenLength >= 25) {
- // 마지막 문자 ';' 제거
- tokenData[tokenLength - 1] = tokenData[tokenLength - 1].replace(";", "").trim();
-
- // 서열설정 3자리 숫자로 맞춤
- if (tokenData[8].length() == 1) {
- tokenData[8] = "00" + tokenData[8];
- } else if (tokenData[8].length() == 2) {
- tokenData[8] = "0" + tokenData[8];
- }
-
- // 숫자형 변환 전 처리
- tokenData[24] = (tokenData[24] == null || "".equals(tokenData[24])) ? "0" : tokenData[24];
-
- buf += "\n" + "[ F]" + dataFile.getName() // 파일명
- + "\n";
-
- // 명령 변경구분코드로 변환
- strTmp = "INS".equals(tokenData[0]) ? "01" : ("UPD".equals(tokenData[0]) ? "02" : ("DEL".equals(tokenData[0]) ? "03" : ""));
-
- // 실제 연계 항목 Mapping 작업
- insttCodeRecptn.setChangeSeCode(strTmp); // 명령 :: 변경구분코드
- insttCodeRecptn.setOccrrDe(tokenData[1]); // 날짜 :: 발생일자
- insttCodeRecptn.setEtcCode(tokenData[2]); // 2자리코드 <적용:기타코드> :: 기타코드
- insttCodeRecptn.setInsttCode(tokenData[3]); // 기관코드 :: 기관코드
- insttCodeRecptn.setAllInsttNm(tokenData[4]); // 기관명(전체) :: 전체기관명
- insttCodeRecptn.setLowestInsttNm(tokenData[5]); // 기관명(최하위) :: 최하위기관명
- insttCodeRecptn.setInsttAbrvNm(tokenData[6]); // 기관명(약어) :: 기관약칭명
- insttCodeRecptn.setOdr(tokenData[7]); // 차수 :: 차수
- insttCodeRecptn.setOrd(tokenData[8]); // 서열 :: 서열
- insttCodeRecptn.setInsttOdr(tokenData[9]); // 소속기관차수 :: 기관차수
- insttCodeRecptn.setUpperInsttCode(tokenData[10]); // 차상위기관코드 :: 상위기관코드
- insttCodeRecptn.setBestInsttCode(tokenData[11]); // 최상위기관코드 :: 최상위기관코드
- insttCodeRecptn.setReprsntInsttCode(tokenData[12]); // 대표기관코드 :: 대표기관코드
- insttCodeRecptn.setInsttTyLclas(tokenData[13]); // 기관유형(대) :: 기관유형대분류
- insttCodeRecptn.setInsttTyMclas(tokenData[14]); // 기관유형(중) :: 기관유형중분류
- insttCodeRecptn.setInsttTySclas(tokenData[15]); // 기관유형(소) :: 기관유형소분류
- insttCodeRecptn.setTelno(tokenData[16]); // 전화번호 :: 전화번호
- insttCodeRecptn.setFxnum(tokenData[17]); // 팩스번호 :: 팩스번호
- insttCodeRecptn.setCreatDe(tokenData[18]); // 생성일자 :: 생성일자
- insttCodeRecptn.setAblDe(tokenData[19]); // 폐지일자 :: 폐지일자
- insttCodeRecptn.setAblEnnc(tokenData[20]); // 폐지구분 :: 폐지유무
- insttCodeRecptn.setChangede(tokenData[21]); // 변경일자 :: 변경일자
- insttCodeRecptn.setChangeTime(tokenData[22]); // 변경시간 :: 변경시간
- insttCodeRecptn.setBsisDe(tokenData[23]); // 기초날짜 :: 기초일자
- insttCodeRecptn.setSortOrdr(Integer.parseInt(tokenData[24])); // 트리순서(트리서열) <적용:정렬순서>:: 정렬순서
-
- // 작업일자
- if (insttCodeRecptn.getOccrrDe().equals("") || insttCodeRecptn.getOccrrDe() == null) {
- insttCodeRecptn.setOccrrDe(strdate.substring(0, 8));
- }
-
- // 작업일련번호 확인 Generation
- int iOpertSn = idgenService.getNextIntegerId();
- insttCodeRecptn.setOpertSn(iOpertSn);
-
- buf += "\n-all--------------\n";
-
- for (int i = 0; i < tokenLength; i++) {
- buf += "SPLIT [" + Integer.toString(tokenData[i].length()) + "]>>>>>> " + Integer.toString(i) + " : [" + tokenData[i] + "]\n";
- }
-
- } else {
-
- LOGGER.debug("\n\n*****************************************************************");
- LOGGER.debug(buf);
- LOGGER.debug("\n\n*****************************************************************");
- LOGGER.debug(readData);
-
- continue;
- }
- LOGGER.debug("\n\n*****************************************************************");
- LOGGER.debug("\n\n*****************************************************************");
- LOGGER.debug(buf);
-
- buf += "\n---------------\n";
-
- // 로그인VO에서 사용자 정보 가져오기
- LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
- // KISA 보안취약점 조치 (2018-12-10, 신용호)
- String uniqId = "";
- if (loginVO!=null) loginVO.getUniqId();
- insttCodeRecptn.setFrstRegisterId(uniqId);
- insttCodeRecptn.setLastUpdusrId(uniqId);
-
- // changeSeCode 변경구분코드
- // '01' 기관생성
- // '02' 기관변경
- // '03' 기관말소
-
- // processSe 처리구분
- // '00' 수신처리
- // '01' 처리완료
- // '11' 생성오류
- // '12' 변경오류
- // '13' 말소오류
-
- // 작업구분 - 수신
- insttCodeRecptn.setProcessSe("00");
- insttCodeRecptnDAO.insertInsttCodeRecptn(insttCodeRecptn);
-
- // 작업구분 - 처리
- insttCodeRecptn.setProcessSe("01");
- if ("01".equals(insttCodeRecptn.getChangeSeCode())) {
- // 기관생성
- insttCodeRecptnDAO.insertInsttCode(insttCodeRecptn);
- } else if ("02".equals(insttCodeRecptn.getChangeSeCode())) {
- // 기관변경
- insttCodeRecptnDAO.updateInsttCode(insttCodeRecptn);
- } else if ("03".equals(insttCodeRecptn.getChangeSeCode())) {
- // 기관말소
- insttCodeRecptnDAO.deleteInsttCode(insttCodeRecptn);
- }
- readData = in.readLine();//2011.09.05
- }
- EgovResourceCloseHelper.close(in);
-
- // 연계파일 수신이 완료되면 dataFile 파일을 recvOldFileDir 로 이동한다.
- recvOldFile = new File(rcvOldDir + dataFile.getName());
- if (dataFile.isFile()) {
- if (recvOldFile.getParentFile() != null) {//KISA 보안약점 조치 (2018-10-29, 윤창원)
- if (recvOldFile.getParentFile().isDirectory()) {
- dataFile.renameTo(recvOldFile);
- }
- }
- } else {
- // 진행종료
- processException("dataFile filename or rcvold path is not valid!!!");
- //throw new Exception("dataFile filename or rcvold path is not valid!!!");
- }
- }
- } catch (IOException e) {
- egovLogger.error("IOException", e);
- } finally {
- EgovResourceCloseHelper.close(fin, sin, in);
-
- fileCount++;
- }
-
- } while (fileCount < recvFileList.length);
+ /**
+ * 기관코드 페이지수를 확인한다.
+ */
+ public static int numberOfRows() throws IOException, ParseException {
+ int pageNo = 1;
+
+ String requestString = requestString(1, 1);
+
+ URL url = new URL(requestString);
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("GET");
+ conn.setRequestProperty("Content-Type", "application/json");
+ conn.setRequestProperty("Accept", "*/*;q=0.9");
+ conn.setDoOutput(true);
+ conn.setUseCaches(false);
+
+ BufferedReader br;
+ if (conn.getResponseCode() >= 200 && conn.getResponseCode() <= 300) {
+
+ br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+ StringBuilder sb = new StringBuilder();
+ String line;
+ while ((line = br.readLine()) != null) {
+ sb.append(line);
+ }
+ br.close();
+
+ JSONParser jsonParser = new JSONParser();
+ JSONObject jsonObject = (JSONObject) jsonParser.parse(sb.toString());
+ JSONArray jsonArray = (JSONArray) jsonObject.get("StanOrgCd");
+ JSONObject headObject = (JSONObject) jsonArray.get(0);
+ JSONArray headArray = (JSONArray) headObject.get("head");
+ JSONObject object = (JSONObject) headArray.get(0);
+ int totalCount = Integer.parseInt(object.get("totalCount").toString());
+ pageNo = (int) Math.ceil((double) totalCount/1000);
+
+ } else {
+ System.out.println("##### InsttCodeRecptnService.numberOfRows() Error Code >>> " + conn.getResponseCode());
+ }
+
+ conn.disconnect();
+
+ return pageNo;
+ }
+
+ /**
+ * 기관코드를 수신한다.
+ */
+ public static List> apiLink() throws IOException, ParseException {
+ List> organizationCodeList = new ArrayList<>();
+
+ int pageNo = 1;
+ int numOfRows = 1000;
+
+ pageNo = numberOfRows();
+
+ for (int p = 1; p <= pageNo; p++) {
+
+ String requestString = requestString(p, numOfRows);
+
+ URL url = new URL(requestString);
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setRequestMethod("GET");
+ conn.setRequestProperty("Content-Type", "application/json");
+ conn.setRequestProperty("Accept", "*/*;q=0.9");
+ conn.setDoOutput(true);
+ conn.setUseCaches(false);
+
+ BufferedReader br;
+ if (conn.getResponseCode() >= 200 && conn.getResponseCode() <= 300) {
+
+ br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+ StringBuilder sb = new StringBuilder();
+ String line;
+ while ((line = br.readLine()) != null) {
+ sb.append(line);
+ }
+ br.close();
+
+ JSONParser jsonParser = new JSONParser();
+ JSONObject jsonObject = (JSONObject) jsonParser.parse(sb.toString());
+ JSONArray jsonArray = (JSONArray) jsonObject.get("StanOrgCd");
+ JSONObject bodyObject = (JSONObject) jsonArray.get(1);
+ JSONArray row = (JSONArray) bodyObject.get("row");
+
+ for (int r = 0; r < row.size(); r++) {
+ JSONObject object = (JSONObject) row.get(r);
+ HashMap organizationCode = new HashMap<>();
+ organizationCode.put("orgCd", stringValueOf(object.get("org_cd")));
+ organizationCode.put("fullNm",stringValueOf(object.get("full_nm")));
+ organizationCode.put("lowNm", stringValueOf(object.get("low_nm")));
+ organizationCode.put("abbrNm", stringValueOf(object.get("abbr_nm")));
+ organizationCode.put("gapNo", stringValueOf(object.get("gap_no")));
+ organizationCode.put("rankNo", stringValueOf(object.get("rank_no")));
+ organizationCode.put("subChasu", stringValueOf(object.get("sub_chasu")));
+ organizationCode.put("highCd", stringValueOf(object.get("high_cd")));
+ organizationCode.put("highstCd", stringValueOf(object.get("highst_cd")));
+ organizationCode.put("repCd", stringValueOf(object.get("rep_cd")));
+ organizationCode.put("typebigNm", stringValueOf(object.get("typebig_nm")));
+ organizationCode.put("typemidNm", stringValueOf(object.get("typemid_nm")));
+ organizationCode.put("typesmlNm", stringValueOf(object.get("typesml_nm")));
+ organizationCode.put("locatstdCd", stringValueOf(object.get("locatstd_cd")));
+ organizationCode.put("useCd", stringValueOf(object.get("use_cd")));
+ organizationCode.put("crtDe", stringValueOf(object.get("crt_de")));
+ organizationCode.put("clsDe", stringValueOf(object.get("cls_de")));
+ organizationCode.put("stopSelt", stringValueOf(object.get("stop_selt")));
+ organizationCode.put("chgDe", stringValueOf(object.get("chg_de")));
+ organizationCode.put("baseDate", stringValueOf(object.get("base_date")));
+ organizationCode.put("adptDate", stringValueOf(object.get("adpt_date")));
+ organizationCode.put("preorgCd", stringValueOf(object.get("preorg_cd")));
+ organizationCodeList.add(organizationCode);
+ }
+
+ } else {
+ System.out.println("##### InsttCodeRecptnService.apiLink() Error Code >>> " + conn.getResponseCode());
+ }
+
+ conn.disconnect();
}
+
+ return organizationCodeList;
+ }
+
+ private static String stringValueOf(Object object) {
+ return object == null ? "" : String.valueOf(object);
}
/**
diff --git a/src/main/java/egovframework/com/sym/log/slg/service/impl/EgovSysHistoryServiceImpl.java b/src/main/java/egovframework/com/sym/log/slg/service/impl/EgovSysHistoryServiceImpl.java
index 101e8a1a6..1405a0ad1 100644
--- a/src/main/java/egovframework/com/sym/log/slg/service/impl/EgovSysHistoryServiceImpl.java
+++ b/src/main/java/egovframework/com/sym/log/slg/service/impl/EgovSysHistoryServiceImpl.java
@@ -79,7 +79,7 @@ public void deleteSysHistory(SysHistory history) throws Exception {
sysHistoryDAO.deleteSysHistory(history);
}
- /**
+ /**
* 시스템 이력정보 목록을 조회한다.
*
* @param history - 시스템 이력정보가 담긴 모델 객체
diff --git a/src/main/java/egovframework/com/sym/log/slg/web/EgovSysHistoryController.java b/src/main/java/egovframework/com/sym/log/slg/web/EgovSysHistoryController.java
index 9cf03f429..8ba15d851 100644
--- a/src/main/java/egovframework/com/sym/log/slg/web/EgovSysHistoryController.java
+++ b/src/main/java/egovframework/com/sym/log/slg/web/EgovSysHistoryController.java
@@ -237,7 +237,7 @@ public String deleteSysHistory(
return "forward:/sym/log/slg/SelectSysHistoryList.do";
}
- /**
+ /**
* 시스템이력 목록 조회
*
* @param history
diff --git a/src/main/java/egovframework/com/sym/log/tlg/service/EgovTrsmrcvLogService.java b/src/main/java/egovframework/com/sym/log/tlg/service/EgovTrsmrcvLogService.java
index 205eb0e0f..37877d6f8 100644
--- a/src/main/java/egovframework/com/sym/log/tlg/service/EgovTrsmrcvLogService.java
+++ b/src/main/java/egovframework/com/sym/log/tlg/service/EgovTrsmrcvLogService.java
@@ -44,7 +44,7 @@ public interface EgovTrsmrcvLogService {
*/
public TrsmrcvLog selectTrsmrcvLog(TrsmrcvLog trsmrcvLog) throws Exception;
- /**
+ /**
* 송수신 로그정보 목록을 조회한다.
*
* @param TrsmrcvLog
diff --git a/src/main/java/egovframework/com/sym/log/tlg/service/impl/EgovTrsmrcvLogServiceImpl.java b/src/main/java/egovframework/com/sym/log/tlg/service/impl/EgovTrsmrcvLogServiceImpl.java
index 295025f5d..bc1578ea3 100644
--- a/src/main/java/egovframework/com/sym/log/tlg/service/impl/EgovTrsmrcvLogServiceImpl.java
+++ b/src/main/java/egovframework/com/sym/log/tlg/service/impl/EgovTrsmrcvLogServiceImpl.java
@@ -78,7 +78,7 @@ public TrsmrcvLog selectTrsmrcvLog(TrsmrcvLog trsmrcvLog) throws Exception{
return trsmrcvLogDAO.selectTrsmrcvLog(trsmrcvLog);
}
- /**
+ /**
* 송수신 로그정보 목록을 조회한다.
*
* @param TrsmrcvLog
diff --git a/src/main/java/egovframework/com/sym/log/tlg/service/impl/TrsmrcvLogDAO.java b/src/main/java/egovframework/com/sym/log/tlg/service/impl/TrsmrcvLogDAO.java
index f800c8824..3bbf963f9 100644
--- a/src/main/java/egovframework/com/sym/log/tlg/service/impl/TrsmrcvLogDAO.java
+++ b/src/main/java/egovframework/com/sym/log/tlg/service/impl/TrsmrcvLogDAO.java
@@ -61,7 +61,7 @@ public TrsmrcvLog selectTrsmrcvLog(TrsmrcvLog trsmrcvLog) throws Exception{
return (TrsmrcvLog) selectOne("TrsmrcvLogDAO.selectTrsmrcvLog", trsmrcvLog);
}
- /**
+ /**
* 송수신 로그정보 목록을 조회한다.
*
* @param TrsmrcvLog
diff --git a/src/main/java/egovframework/com/sym/log/tlg/web/EgovTrsmrcvLogController.java b/src/main/java/egovframework/com/sym/log/tlg/web/EgovTrsmrcvLogController.java
index 6384dce5a..7daa85e11 100644
--- a/src/main/java/egovframework/com/sym/log/tlg/web/EgovTrsmrcvLogController.java
+++ b/src/main/java/egovframework/com/sym/log/tlg/web/EgovTrsmrcvLogController.java
@@ -55,7 +55,7 @@ public class EgovTrsmrcvLogController {
@Resource(name = "EgovCmmUseService")
private EgovCmmUseService cmmUseService;
- /**
+ /**
* 송수신 로그 목록 조회
*
* @param trsmrcvLog
@@ -67,29 +67,29 @@ public class EgovTrsmrcvLogController {
public String selectTrsmrcvLogInf(@ModelAttribute("searchVO") TrsmrcvLog trsmrcvLog, ModelMap model)
throws Exception {
- trsmrcvLog.setPageUnit(propertyService.getInt("pageUnit"));
- trsmrcvLog.setPageSize(propertyService.getInt("pageSize"));
+ trsmrcvLog.setPageUnit(propertyService.getInt("pageUnit"));
+ trsmrcvLog.setPageSize(propertyService.getInt("pageSize"));
- PaginationInfo paginationInfo = new PaginationInfo();
- paginationInfo.setCurrentPageNo(trsmrcvLog.getPageIndex());
- paginationInfo.setRecordCountPerPage(trsmrcvLog.getPageUnit());
- paginationInfo.setPageSize(trsmrcvLog.getPageSize());
+ PaginationInfo paginationInfo = new PaginationInfo();
+ paginationInfo.setCurrentPageNo(trsmrcvLog.getPageIndex());
+ paginationInfo.setRecordCountPerPage(trsmrcvLog.getPageUnit());
+ paginationInfo.setPageSize(trsmrcvLog.getPageSize());
- trsmrcvLog.setFirstIndex(paginationInfo.getFirstRecordIndex());
- trsmrcvLog.setLastIndex(paginationInfo.getLastRecordIndex());
- trsmrcvLog.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+ trsmrcvLog.setFirstIndex(paginationInfo.getFirstRecordIndex());
+ trsmrcvLog.setLastIndex(paginationInfo.getLastRecordIndex());
+ trsmrcvLog.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
- Map map = trsmrcvLogService.selectTrsmrcvLogInf(trsmrcvLog);
- int totCnt = MapUtils.getIntValue(map, "resultCnt");
+ Map map = trsmrcvLogService.selectTrsmrcvLogInf(trsmrcvLog);
+ int totCnt = MapUtils.getIntValue(map, "resultCnt");
- model.addAttribute("resultList", map.get("resultList"));
- model.addAttribute("resultCnt", totCnt);
+ model.addAttribute("resultList", map.get("resultList"));
+ model.addAttribute("resultCnt", totCnt);
- paginationInfo.setTotalRecordCount(totCnt);
- model.addAttribute("paginationInfo", paginationInfo);
+ paginationInfo.setTotalRecordCount(totCnt);
+ model.addAttribute("paginationInfo", paginationInfo);
- return "egovframework/com/sym/log/tlg/EgovTrsmrcvLogList";
- }
+ return "egovframework/com/sym/log/tlg/EgovTrsmrcvLogList";
+ }
/**
* 송수신 로그 상세 조회
@@ -109,8 +109,8 @@ public String selectTrsmrcvLog(@ModelAttribute("searchVO") TrsmrcvLog trsmrcvLog
return "egovframework/com/sym/log/tlg/EgovTrsmrcvLogInqire";
}
- /**
- * 송수신 로그 테스트 화면
+ /**
+ * 송수신 로그 테스트 화면
*
* @param trsmrcvLog
* @return sym/log/slg/EgovSysHistRegist
diff --git a/src/main/java/egovframework/com/sym/log/wlg/service/EgovWebLogService.java b/src/main/java/egovframework/com/sym/log/wlg/service/EgovWebLogService.java
index ca9457b94..76553c22f 100644
--- a/src/main/java/egovframework/com/sym/log/wlg/service/EgovWebLogService.java
+++ b/src/main/java/egovframework/com/sym/log/wlg/service/EgovWebLogService.java
@@ -44,11 +44,11 @@ public interface EgovWebLogService {
*/
public WebLog selectWebLog(WebLog webLog) throws Exception;
- /**
- * 웹 로그정보 목록을 조회한다.
- *
- * @param WebLog
- */
- public Map selectWebLogInf(WebLog webLog) throws Exception;
+ /**
+ * 웹 로그정보 목록을 조회한다.
+ *
+ * @param WebLog
+ */
+ public Map selectWebLogInf(WebLog webLog) throws Exception;
}
diff --git a/src/main/java/egovframework/com/sym/log/wlg/service/impl/EgovWebLogServiceImpl.java b/src/main/java/egovframework/com/sym/log/wlg/service/impl/EgovWebLogServiceImpl.java
index 1ff4aae95..4238e8997 100644
--- a/src/main/java/egovframework/com/sym/log/wlg/service/impl/EgovWebLogServiceImpl.java
+++ b/src/main/java/egovframework/com/sym/log/wlg/service/impl/EgovWebLogServiceImpl.java
@@ -78,21 +78,21 @@ public WebLog selectWebLog(WebLog webLog) throws Exception{
return webLogDAO.selectWebLog(webLog);
}
- /**
- * 웹 로그정보 목록을 조회한다.
- *
- * @param WebLog
- */
- @Override
- public Map selectWebLogInf(WebLog webLog) throws Exception {
- List resultList = webLogDAO.selectWebLogInf(webLog);
- int totCnt = webLogDAO.selectWebLogInfCnt(webLog);
-
- Map map = new HashMap<>();
+ /**
+ * 웹 로그정보 목록을 조회한다.
+ *
+ * @param WebLog
+ */
+ @Override
+ public Map selectWebLogInf(WebLog webLog) throws Exception {
+ List resultList = webLogDAO.selectWebLogInf(webLog);
+ int totCnt = webLogDAO.selectWebLogInfCnt(webLog);
+
+ Map map = new HashMap<>();
map.put("resultList", resultList);
map.put("resultCnt", totCnt);
return map;
- }
+ }
}
diff --git a/src/main/java/egovframework/com/sym/log/wlg/service/impl/WebLogDAO.java b/src/main/java/egovframework/com/sym/log/wlg/service/impl/WebLogDAO.java
index 32c2de40d..070bfd2d4 100644
--- a/src/main/java/egovframework/com/sym/log/wlg/service/impl/WebLogDAO.java
+++ b/src/main/java/egovframework/com/sym/log/wlg/service/impl/WebLogDAO.java
@@ -61,16 +61,16 @@ public WebLog selectWebLog(WebLog webLog) throws Exception{
return (WebLog) selectOne("WebLog.selectWebLog", webLog);
}
- /**
- * 웹 로그정보 목록을 조회한다.
- *
- * @param webLog
- * @return
- * @throws Exception
- */
- public List selectWebLogInf(WebLog webLog) throws Exception {
- return selectList("WebLog.selectWebLogInf", webLog);
- }
+ /**
+ * 웹 로그정보 목록을 조회한다.
+ *
+ * @param webLog
+ * @return
+ * @throws Exception
+ */
+ public List selectWebLogInf(WebLog webLog) throws Exception{
+ return selectList("WebLog.selectWebLogInf", webLog);
+ }
/**
* 웹 로그정보 목록의 숫자를 조회한다.
diff --git a/src/main/java/egovframework/com/sym/log/wlg/web/EgovWebLogController.java b/src/main/java/egovframework/com/sym/log/wlg/web/EgovWebLogController.java
index c88aef5a6..f9711673f 100644
--- a/src/main/java/egovframework/com/sym/log/wlg/web/EgovWebLogController.java
+++ b/src/main/java/egovframework/com/sym/log/wlg/web/EgovWebLogController.java
@@ -45,7 +45,7 @@ public class EgovWebLogController {
@Resource(name="propertiesService")
protected EgovPropertyService propertyService;
- /**
+ /**
* 웹 로그 목록 조회
*
* @param webLog
@@ -56,28 +56,28 @@ public class EgovWebLogController {
@RequestMapping(value = "/sym/log/wlg/SelectWebLogList.do")
public String selectWebLogInf(@ModelAttribute("searchVO") WebLog webLog, ModelMap model) throws Exception {
- webLog.setPageUnit(propertyService.getInt("pageUnit"));
- webLog.setPageSize(propertyService.getInt("pageSize"));
+ webLog.setPageUnit(propertyService.getInt("pageUnit"));
+ webLog.setPageSize(propertyService.getInt("pageSize"));
- PaginationInfo paginationInfo = new PaginationInfo();
- paginationInfo.setCurrentPageNo(webLog.getPageIndex());
- paginationInfo.setRecordCountPerPage(webLog.getPageUnit());
- paginationInfo.setPageSize(webLog.getPageSize());
+ PaginationInfo paginationInfo = new PaginationInfo();
+ paginationInfo.setCurrentPageNo(webLog.getPageIndex());
+ paginationInfo.setRecordCountPerPage(webLog.getPageUnit());
+ paginationInfo.setPageSize(webLog.getPageSize());
- webLog.setFirstIndex(paginationInfo.getFirstRecordIndex());
- webLog.setLastIndex(paginationInfo.getLastRecordIndex());
- webLog.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+ webLog.setFirstIndex(paginationInfo.getFirstRecordIndex());
+ webLog.setLastIndex(paginationInfo.getLastRecordIndex());
+ webLog.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
- Map map = webLogService.selectWebLogInf(webLog);
+ Map map = webLogService.selectWebLogInf(webLog);
int totCnt = MapUtils.getInteger(map, "resultCnt");
model.addAttribute("resultList", map.get("resultList"));
- paginationInfo.setTotalRecordCount(totCnt);
- model.addAttribute("paginationInfo", paginationInfo);
+ paginationInfo.setTotalRecordCount(totCnt);
+ model.addAttribute("paginationInfo", paginationInfo);
- return "egovframework/com/sym/log/wlg/EgovWebLogList";
- }
+ return "egovframework/com/sym/log/wlg/EgovWebLogList";
+ }
/**
* 웹 로그 상세 조회
diff --git a/src/main/java/egovframework/com/sym/mnu/bmm/service/EgovBkmkMenuManageservice.java b/src/main/java/egovframework/com/sym/mnu/bmm/service/EgovBkmkMenuManageservice.java
index 23690ac35..f1834b69c 100644
--- a/src/main/java/egovframework/com/sym/mnu/bmm/service/EgovBkmkMenuManageservice.java
+++ b/src/main/java/egovframework/com/sym/mnu/bmm/service/EgovBkmkMenuManageservice.java
@@ -1,3 +1,4 @@
+
package egovframework.com.sym.mnu.bmm.service;
import java.util.List;
diff --git a/src/main/java/egovframework/com/sym/mnu/bmm/service/impl/EgovBkmkMenuManageServiceImpl.java b/src/main/java/egovframework/com/sym/mnu/bmm/service/impl/EgovBkmkMenuManageServiceImpl.java
index b418ef354..ac40630a7 100644
--- a/src/main/java/egovframework/com/sym/mnu/bmm/service/impl/EgovBkmkMenuManageServiceImpl.java
+++ b/src/main/java/egovframework/com/sym/mnu/bmm/service/impl/EgovBkmkMenuManageServiceImpl.java
@@ -116,7 +116,7 @@ public Map selectMenuList(BkmkMenuManageVO bkmkMenuManageVO)
* 미리보기를 할 바로가기메뉴관리의 목록을 조회한다.
*
* @param BkmkMenuManageVO
- * @return List
+ * @return List
* @throws Exception
*/
public List selectBkmkPreviewList(BkmkMenuManageVO bkmkMenuManageVO) throws Exception {
diff --git a/src/main/java/egovframework/com/sym/mnu/mcm/service/EgovMenuCreateManageService.java b/src/main/java/egovframework/com/sym/mnu/mcm/service/EgovMenuCreateManageService.java
index b9bba63ae..d393a52b6 100644
--- a/src/main/java/egovframework/com/sym/mnu/mcm/service/EgovMenuCreateManageService.java
+++ b/src/main/java/egovframework/com/sym/mnu/mcm/service/EgovMenuCreateManageService.java
@@ -42,7 +42,7 @@ public interface EgovMenuCreateManageService {
MenuCreatVO selectAuthorByUsr(ComDefaultVO vo) throws Exception;
- /**
+ /**
* 메뉴생성관리 목록을 조회
*
* @param vo ComDefaultVO
@@ -59,7 +59,7 @@ public interface EgovMenuCreateManageService {
*/
int selectMenuCreatManagTotCnt(ComDefaultVO vo) throws Exception;
- /**
+ /**
* 메뉴생성 내역을 조회
*
* @param vo MenuCreatVO
@@ -68,6 +68,7 @@ public interface EgovMenuCreateManageService {
*/
List selectMenuCreatList(MenuCreatVO vo) throws Exception;
+
/**
* 화면에 조회된 메뉴정보로 메뉴생성내역 데이터베이스에서 입력
* @param checkedScrtyForInsert String
diff --git a/src/main/java/egovframework/com/sym/mnu/mcm/service/impl/EgovMenuCreateManageServiceImpl.java b/src/main/java/egovframework/com/sym/mnu/mcm/service/impl/EgovMenuCreateManageServiceImpl.java
index 2cf1a8a7d..4ca3d7322 100644
--- a/src/main/java/egovframework/com/sym/mnu/mcm/service/impl/EgovMenuCreateManageServiceImpl.java
+++ b/src/main/java/egovframework/com/sym/mnu/mcm/service/impl/EgovMenuCreateManageServiceImpl.java
@@ -50,7 +50,7 @@ public int selectUsrByPk(ComDefaultVO vo) throws Exception {
return menuCreateManageDAO.selectUsrByPk(vo);
}
- /**
+ /**
* 메뉴생성 내역을 조회
*
* @param vo MenuCreatVO
@@ -88,7 +88,7 @@ public void insertMenuCreatList(String checkedAuthorForInsert, String checkedMen
}
}
- /**
+ /**
* 메뉴생성관리 목록을 조회
*
* @param vo ComDefaultVO
diff --git a/src/main/java/egovframework/com/sym/mnu/mcm/service/impl/MenuCreateManageDAO.java b/src/main/java/egovframework/com/sym/mnu/mcm/service/impl/MenuCreateManageDAO.java
index 508831fc7..d667aca08 100644
--- a/src/main/java/egovframework/com/sym/mnu/mcm/service/impl/MenuCreateManageDAO.java
+++ b/src/main/java/egovframework/com/sym/mnu/mcm/service/impl/MenuCreateManageDAO.java
@@ -53,7 +53,7 @@ public MenuCreatVO selectAuthorByUsr(ComDefaultVO vo) throws Exception{
return (MenuCreatVO)selectOne("menuManageDAO.selectAuthorByUsr", vo);
}
- /**
+ /**
* 메뉴생성관리 내역을 조회
*
* @param vo ComDefaultVO
diff --git a/src/main/java/egovframework/com/sym/mnu/mcm/web/EgovMenuCreateManageController.java b/src/main/java/egovframework/com/sym/mnu/mcm/web/EgovMenuCreateManageController.java
index 0679aed9e..d1af81a15 100644
--- a/src/main/java/egovframework/com/sym/mnu/mcm/web/EgovMenuCreateManageController.java
+++ b/src/main/java/egovframework/com/sym/mnu/mcm/web/EgovMenuCreateManageController.java
@@ -63,59 +63,59 @@ public class EgovMenuCreateManageController {
@Resource(name = "egovMessageSource")
EgovMessageSource egovMessageSource;
- /*********** 메뉴 생성 관리 ***************/
+ /*********** 메뉴 생성 관리 ***************/
- /**
- * *메뉴생성목록을 조회한다.
- *
- * @param searchVO ComDefaultVO
- * @return 출력페이지정보 "sym/mnu/mcm/EgovMenuCreatManage"
- * @exception Exception
- */
- @IncludedInfo(name = "메뉴생성관리", order = 1100, gid = 60)
- @RequestMapping(value = "/sym/mnu/mcm/EgovMenuCreatManageSelect.do")
- public String selectMenuCreatManagList(@ModelAttribute("searchVO") ComDefaultVO searchVO, ModelMap model)
- throws Exception {
- String resultMsg = "";
- // 0. Spring Security 사용자권한 처리
- Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated();
- if (!isAuthenticated) {
- model.addAttribute("message", egovMessageSource.getMessage("fail.common.login"));
- return "redirect:/uat/uia/egovLoginUsr.do";
- }
- // 내역 조회
- /** EgovPropertyService.sample */
- searchVO.setPageUnit(propertiesService.getInt("pageUnit"));
- searchVO.setPageSize(propertiesService.getInt("pageSize"));
+ /**
+ * *메뉴생성목록을 조회한다.
+ *
+ * @param searchVO ComDefaultVO
+ * @return 출력페이지정보 "sym/mnu/mcm/EgovMenuCreatManage"
+ * @exception Exception
+ */
+ @IncludedInfo(name = "메뉴생성관리", order = 1100, gid = 60)
+ @RequestMapping(value = "/sym/mnu/mcm/EgovMenuCreatManageSelect.do")
+ public String selectMenuCreatManagList(@ModelAttribute("searchVO") ComDefaultVO searchVO, ModelMap model)
+ throws Exception {
+ String resultMsg = "";
+ // 0. Spring Security 사용자권한 처리
+ Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated();
+ if (!isAuthenticated) {
+ model.addAttribute("message", egovMessageSource.getMessage("fail.common.login"));
+ return "redirect:/uat/uia/egovLoginUsr.do";
+ }
+ // 내역 조회
+ /** EgovPropertyService.sample */
+ searchVO.setPageUnit(propertiesService.getInt("pageUnit"));
+ searchVO.setPageSize(propertiesService.getInt("pageSize"));
- /** pageing */
- PaginationInfo paginationInfo = new PaginationInfo();
- paginationInfo.setCurrentPageNo(searchVO.getPageIndex());
- paginationInfo.setRecordCountPerPage(searchVO.getPageUnit());
- paginationInfo.setPageSize(searchVO.getPageSize());
+ /** pageing */
+ PaginationInfo paginationInfo = new PaginationInfo();
+ paginationInfo.setCurrentPageNo(searchVO.getPageIndex());
+ paginationInfo.setRecordCountPerPage(searchVO.getPageUnit());
+ paginationInfo.setPageSize(searchVO.getPageSize());
- searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
- searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
- searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
- /*
+ searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+ searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
+ searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+ /*
* if (searchVO.getSearchKeyword() != null && !searchVO.getSearchKeyword().equals("")) {
*
* int IDcnt = menuCreateManageService.selectUsrByPk(searchVO); if (IDcnt == 0) { resultMsg = egovMessageSource.getMessage("info.nodata.msg"); } else { // AuthorCode 검색 MenuCreatVO vo = new MenuCreatVO(); vo = menuCreateManageService.selectAuthorByUsr(searchVO); searchVO.setSearchKeyword(vo.getAuthorCode()); } }
*/
- List resultList = menuCreateManageService.selectMenuCreatManagList(searchVO);
+ List resultList = menuCreateManageService.selectMenuCreatManagList(searchVO);
if (resultList.size() == 0) {
resultMsg = egovMessageSource.getMessage("info.nodata.msg");
}
model.addAttribute("resultList", resultList);
+
+ int totCnt = menuCreateManageService.selectMenuCreatManagTotCnt(searchVO);
+ paginationInfo.setTotalRecordCount(totCnt);
+ model.addAttribute("paginationInfo", paginationInfo);
+ model.addAttribute("resultMsg", resultMsg);
+ return "egovframework/com/sym/mnu/mcm/EgovMenuCreatManage";
+ }
- int totCnt = menuCreateManageService.selectMenuCreatManagTotCnt(searchVO);
- paginationInfo.setTotalRecordCount(totCnt);
- model.addAttribute("paginationInfo", paginationInfo);
- model.addAttribute("resultMsg", resultMsg);
- return "egovframework/com/sym/mnu/mcm/EgovMenuCreatManage";
- }
-
- /**
+ /**
* 메뉴생성 세부화면을 조회한다.
*
* @param menuCreatVO MenuCreatVO
@@ -134,8 +134,8 @@ public String selectMenuCreatList(@ModelAttribute MenuCreatVO menuCreatVO, Model
model.addAttribute("resultList", resultList);
model.addAttribute("resultVO", menuCreatVO);
- return "egovframework/com/sym/mnu/mcm/EgovMenuCreat";
- }
+ return "egovframework/com/sym/mnu/mcm/EgovMenuCreat";
+ }
/**
* 메뉴생성처리 및 메뉴생성내역을 등록한다.
diff --git a/src/main/java/egovframework/com/sym/mnu/mpm/service/EgovMenuManageService.java b/src/main/java/egovframework/com/sym/mnu/mpm/service/EgovMenuManageService.java
index 4dfc0c8c9..5806e9d4f 100644
--- a/src/main/java/egovframework/com/sym/mnu/mpm/service/EgovMenuManageService.java
+++ b/src/main/java/egovframework/com/sym/mnu/mpm/service/EgovMenuManageService.java
@@ -36,7 +36,7 @@ public interface EgovMenuManageService {
*/
MenuManageVO selectMenuManage(ComDefaultVO vo) throws Exception;
- /**
+ /**
* 메뉴 목록을 조회
*
* @param vo ComDefaultVO
diff --git a/src/main/java/egovframework/com/sym/mnu/mpm/service/impl/EgovMenuManageServiceImpl.java b/src/main/java/egovframework/com/sym/mnu/mpm/service/impl/EgovMenuManageServiceImpl.java
index 19ff7b211..3e02390f8 100644
--- a/src/main/java/egovframework/com/sym/mnu/mpm/service/impl/EgovMenuManageServiceImpl.java
+++ b/src/main/java/egovframework/com/sym/mnu/mpm/service/impl/EgovMenuManageServiceImpl.java
@@ -67,7 +67,7 @@ public MenuManageVO selectMenuManage(ComDefaultVO vo) throws Exception {
return menuManageDAO.selectMenuManage(vo);
}
- /**
+ /**
* 메뉴 목록을 조회
*
* @param vo ComDefaultVO
diff --git a/src/main/java/egovframework/com/sym/mnu/mpm/service/impl/MenuManageDAO.java b/src/main/java/egovframework/com/sym/mnu/mpm/service/impl/MenuManageDAO.java
index 3404f75e4..40a141fd2 100644
--- a/src/main/java/egovframework/com/sym/mnu/mpm/service/impl/MenuManageDAO.java
+++ b/src/main/java/egovframework/com/sym/mnu/mpm/service/impl/MenuManageDAO.java
@@ -1,4 +1,4 @@
-package egovframework.com.sym.mnu.mpm.service.impl;
+ package egovframework.com.sym.mnu.mpm.service.impl;
import java.util.List;
@@ -30,7 +30,7 @@
@Repository("menuManageDAO")
public class MenuManageDAO extends EgovComAbstractDAO{
- /**
+ /**
* 메뉴목록을 조회
*
* @param vo ComDefaultVO
diff --git a/src/main/java/egovframework/com/sym/mnu/mpm/web/EgovMenuManageController.java b/src/main/java/egovframework/com/sym/mnu/mpm/web/EgovMenuManageController.java
index a4dfba657..3a745bc97 100644
--- a/src/main/java/egovframework/com/sym/mnu/mpm/web/EgovMenuManageController.java
+++ b/src/main/java/egovframework/com/sym/mnu/mpm/web/EgovMenuManageController.java
@@ -114,7 +114,7 @@ public String selectMenuManage(
return "egovframework/com/sym/mnu/mpm/EgovMenuDetailSelectUpdt";
}
- /**
+ /**
* 메뉴목록 리스트조회한다.
*
* @param searchVO ComDefaultVO
diff --git a/src/main/java/egovframework/com/sym/prm/service/EgovProgrmManageService.java b/src/main/java/egovframework/com/sym/prm/service/EgovProgrmManageService.java
index e7451b051..898fbeee0 100644
--- a/src/main/java/egovframework/com/sym/prm/service/EgovProgrmManageService.java
+++ b/src/main/java/egovframework/com/sym/prm/service/EgovProgrmManageService.java
@@ -29,8 +29,8 @@ public interface EgovProgrmManageService {
* @exception Exception
*/
ProgrmManageVO selectProgrm(ProgrmManageVO vo) throws Exception;
-
- /**
+
+ /**
* 프로그램 목록을 조회
*
* @param vo ComDefaultVO
@@ -38,7 +38,7 @@ public interface EgovProgrmManageService {
* @exception Exception
*/
List selectProgrmList(ComDefaultVO vo) throws Exception;
-
+
/**
* 프로그램목록 총건수를 조회한다.
* @param vo ComDefaultVO
diff --git a/src/main/java/egovframework/com/sym/prm/service/impl/EgovProgrmManageServiceImpl.java b/src/main/java/egovframework/com/sym/prm/service/impl/EgovProgrmManageServiceImpl.java
index 953bf780d..dc21e490b 100644
--- a/src/main/java/egovframework/com/sym/prm/service/impl/EgovProgrmManageServiceImpl.java
+++ b/src/main/java/egovframework/com/sym/prm/service/impl/EgovProgrmManageServiceImpl.java
@@ -46,8 +46,8 @@ public class EgovProgrmManageServiceImpl extends EgovAbstractServiceImpl impleme
public ProgrmManageVO selectProgrm(ProgrmManageVO vo) throws Exception{
return progrmManageDAO.selectProgrm(vo);
}
-
- /**
+
+ /**
* 프로그램 목록을 조회
*
* @param vo ComDefaultVO
@@ -58,7 +58,7 @@ public ProgrmManageVO selectProgrm(ProgrmManageVO vo) throws Exception{
public List selectProgrmList(ComDefaultVO vo) throws Exception {
return progrmManageDAO.selectProgrmList(vo);
}
-
+
/**
* 프로그램목록 총건수를 조회한다.
* @param vo ComDefaultVO
diff --git a/src/main/java/egovframework/com/sym/prm/service/impl/ProgrmManageDAO.java b/src/main/java/egovframework/com/sym/prm/service/impl/ProgrmManageDAO.java
index cfbd9945e..9295d5fa0 100644
--- a/src/main/java/egovframework/com/sym/prm/service/impl/ProgrmManageDAO.java
+++ b/src/main/java/egovframework/com/sym/prm/service/impl/ProgrmManageDAO.java
@@ -28,7 +28,7 @@
@Repository("progrmManageDAO")
public class ProgrmManageDAO extends EgovComAbstractDAO {
- /**
+ /**
* 프로그램 목록을 조회
*
* @param vo ComDefaultVO
diff --git a/src/main/java/egovframework/com/sym/prm/web/EgovProgrmManageController.java b/src/main/java/egovframework/com/sym/prm/web/EgovProgrmManageController.java
index 56d632c70..9a1d41d70 100644
--- a/src/main/java/egovframework/com/sym/prm/web/EgovProgrmManageController.java
+++ b/src/main/java/egovframework/com/sym/prm/web/EgovProgrmManageController.java
@@ -106,34 +106,34 @@ public String selectProgrm(
@RequestMapping(value = "/sym/prm/EgovProgramListManageSelect.do")
public String selectProgrmList(@ModelAttribute("searchVO") ComDefaultVO searchVO, ModelMap model) throws Exception {
// 0. Spring Security 사용자권한 처리
- Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated();
- if (!isAuthenticated) {
- model.addAttribute("message", egovMessageSource.getMessage("fail.common.login"));
- return "redirect:/uat/uia/egovLoginUsr.do";
- }
- // 내역 조회
- /** EgovPropertyService.sample */
- searchVO.setPageUnit(propertiesService.getInt("pageUnit"));
- searchVO.setPageSize(propertiesService.getInt("pageSize"));
-
- /** pageing */
- PaginationInfo paginationInfo = new PaginationInfo();
- paginationInfo.setCurrentPageNo(searchVO.getPageIndex());
- paginationInfo.setRecordCountPerPage(searchVO.getPageUnit());
- paginationInfo.setPageSize(searchVO.getPageSize());
-
- searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
- searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
- searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
-
- List resultList = progrmManageService.selectProgrmList(searchVO);
+ Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated();
+ if (!isAuthenticated) {
+ model.addAttribute("message", egovMessageSource.getMessage("fail.common.login"));
+ return "redirect:/uat/uia/egovLoginUsr.do";
+ }
+ // 내역 조회
+ /** EgovPropertyService.sample */
+ searchVO.setPageUnit(propertiesService.getInt("pageUnit"));
+ searchVO.setPageSize(propertiesService.getInt("pageSize"));
+
+ /** pageing */
+ PaginationInfo paginationInfo = new PaginationInfo();
+ paginationInfo.setCurrentPageNo(searchVO.getPageIndex());
+ paginationInfo.setRecordCountPerPage(searchVO.getPageUnit());
+ paginationInfo.setPageSize(searchVO.getPageSize());
+
+ searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+ searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
+ searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+
+ List resultList = progrmManageService.selectProgrmList(searchVO);
model.addAttribute("resultList", resultList);
int totCnt = progrmManageService.selectProgrmListTotCnt(searchVO);
- paginationInfo.setTotalRecordCount(totCnt);
+ paginationInfo.setTotalRecordCount(totCnt);
model.addAttribute("paginationInfo", paginationInfo);
- return "egovframework/com/sym/prm/EgovProgramListManage";
+ return "egovframework/com/sym/prm/EgovProgramListManage";
}
/**
@@ -729,33 +729,33 @@ public String selectProgramChgHstListDetail(
public String selectProgrmListSearch(@ModelAttribute("searchVO") ComDefaultVO searchVO, ModelMap model)
throws Exception {
// 0. Spring Security 사용자권한 처리
- Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated();
- if (!isAuthenticated) {
- model.addAttribute("message", egovMessageSource.getMessage("fail.common.login"));
- return "redirect:/uat/uia/egovLoginUsr.do";
- }
- // 내역 조회
- searchVO.setPageUnit(propertiesService.getInt("pageUnit"));
- searchVO.setPageSize(propertiesService.getInt("pageSize"));
+ Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated();
+ if (!isAuthenticated) {
+ model.addAttribute("message", egovMessageSource.getMessage("fail.common.login"));
+ return "redirect:/uat/uia/egovLoginUsr.do";
+ }
+ // 내역 조회
+ searchVO.setPageUnit(propertiesService.getInt("pageUnit"));
+ searchVO.setPageSize(propertiesService.getInt("pageSize"));
- /** pageing */
- PaginationInfo paginationInfo = new PaginationInfo();
- paginationInfo.setCurrentPageNo(searchVO.getPageIndex());
- paginationInfo.setRecordCountPerPage(searchVO.getPageUnit());
- paginationInfo.setPageSize(searchVO.getPageSize());
+ /** pageing */
+ PaginationInfo paginationInfo = new PaginationInfo();
+ paginationInfo.setCurrentPageNo(searchVO.getPageIndex());
+ paginationInfo.setRecordCountPerPage(searchVO.getPageUnit());
+ paginationInfo.setPageSize(searchVO.getPageSize());
- searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
- searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
- searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+ searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+ searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
+ searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
- List resultList = progrmManageService.selectProgrmList(searchVO);
+ List resultList = progrmManageService.selectProgrmList(searchVO);
model.addAttribute("resultList", resultList);
int totCnt = progrmManageService.selectProgrmListTotCnt(searchVO);
- paginationInfo.setTotalRecordCount(totCnt);
+ paginationInfo.setTotalRecordCount(totCnt);
model.addAttribute("paginationInfo", paginationInfo);
- return "egovframework/com/sym/prm/EgovFileNmSearch";
+ return "egovframework/com/sym/prm/EgovFileNmSearch";
}
/**
@@ -769,33 +769,32 @@ public String selectProgrmListSearch(@ModelAttribute("searchVO") ComDefaultVO se
public String selectProgrmListSearchNew(@ModelAttribute("searchVO") ComDefaultVO searchVO, ModelMap model)
throws Exception {
// 0. Spring Security 사용자권한 처리
- Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated();
- if (!isAuthenticated) {
- model.addAttribute("message", egovMessageSource.getMessage("fail.common.login"));
- return "redirect:/uat/uia/egovLoginUsr.do";
- }
- // 내역 조회
- searchVO.setPageUnit(propertiesService.getInt("pageUnit"));
- searchVO.setPageSize(propertiesService.getInt("pageSize"));
+ Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated();
+ if (!isAuthenticated) {
+ model.addAttribute("message", egovMessageSource.getMessage("fail.common.login"));
+ return "redirect:/uat/uia/egovLoginUsr.do";
+ }
+ // 내역 조회
+ searchVO.setPageUnit(propertiesService.getInt("pageUnit"));
+ searchVO.setPageSize(propertiesService.getInt("pageSize"));
- /** pageing */
- PaginationInfo paginationInfo = new PaginationInfo();
- paginationInfo.setCurrentPageNo(searchVO.getPageIndex());
- paginationInfo.setRecordCountPerPage(searchVO.getPageUnit());
- paginationInfo.setPageSize(searchVO.getPageSize());
+ /** pageing */
+ PaginationInfo paginationInfo = new PaginationInfo();
+ paginationInfo.setCurrentPageNo(searchVO.getPageIndex());
+ paginationInfo.setRecordCountPerPage(searchVO.getPageUnit());
+ paginationInfo.setPageSize(searchVO.getPageSize());
- searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
- searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
- searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+ searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+ searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
+ searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
- List resultList = progrmManageService.selectProgrmList(searchVO);
+ List resultList = progrmManageService.selectProgrmList(searchVO);
model.addAttribute("resultList", resultList);
int totCnt = progrmManageService.selectProgrmListTotCnt(searchVO);
- paginationInfo.setTotalRecordCount(totCnt);
+ paginationInfo.setTotalRecordCount(totCnt);
model.addAttribute("paginationInfo", paginationInfo);
- return "egovframework/com/sym/prm/EgovFileNmSearchNew";
+ return "egovframework/com/sym/prm/EgovFileNmSearchNew";
}
-
}
\ No newline at end of file
diff --git a/src/main/java/egovframework/com/sym/sym/bak/service/BackupScheduler.java b/src/main/java/egovframework/com/sym/sym/bak/service/BackupScheduler.java
index 55d6f22d9..2a579af29 100644
--- a/src/main/java/egovframework/com/sym/sym/bak/service/BackupScheduler.java
+++ b/src/main/java/egovframework/com/sym/sym/bak/service/BackupScheduler.java
@@ -168,7 +168,7 @@ public void deleteBackupOpert(BackupOpert backupOpert) throws Exception {
}
}
- /**
+ /**
* 클래스 초기화메소드. 배치스케줄테이블을 읽어서 Quartz 스케줄러를 초기화한다.
*
*/
@@ -188,21 +188,21 @@ public void init() throws Exception {
sched = schedFact.getScheduler();
// Set up the listener
- BackupJobListener listener = new BackupJobListener();
+ BackupJobListener listener = new BackupJobListener();
listener.setEgovBackupOpertService(egovBackupOpertService);
listener.setIdgenService(idgenService);
sched.getListenerManager().addJobListener(listener);
- // 스케줄러에 Job, Trigger 등록하기
+ // 스케줄러에 Job, Trigger 등록하기
for (BackupOpert target : targetList) {
LOGGER.debug("Data : {}", target);
- insertBackupOpert(target);
- }
- sched.start();
- }
+ insertBackupOpert(target);
+ }
+ sched.start();
+ }
/**
* 클래스 destroy메소드.
diff --git a/src/main/java/egovframework/com/sym/sym/bak/service/EgovBackupOpertService.java b/src/main/java/egovframework/com/sym/sym/bak/service/EgovBackupOpertService.java
index 8e68589da..2b418b822 100644
--- a/src/main/java/egovframework/com/sym/sym/bak/service/EgovBackupOpertService.java
+++ b/src/main/java/egovframework/com/sym/sym/bak/service/EgovBackupOpertService.java
@@ -45,7 +45,7 @@ public interface EgovBackupOpertService {
*/
public BackupOpert selectBackupOpert(BackupOpert backupOpert) throws Exception;
- /**
+ /**
* 백업작업 목록을 조회한다.
*
* @return 백업작업목록
diff --git a/src/main/java/egovframework/com/sym/sym/bak/service/impl/BackupOpertDao.java b/src/main/java/egovframework/com/sym/sym/bak/service/impl/BackupOpertDao.java
index c45416a78..9ebc7bea7 100644
--- a/src/main/java/egovframework/com/sym/sym/bak/service/impl/BackupOpertDao.java
+++ b/src/main/java/egovframework/com/sym/sym/bak/service/impl/BackupOpertDao.java
@@ -88,7 +88,7 @@ public BackupOpert selectBackupOpert(BackupOpert backupOpert)
return result ;
}
- /**
+ /**
* 백업작업정보목록을 조회한다.
*
* @return 백업작업목록
diff --git a/src/main/java/egovframework/com/sym/sym/bak/service/impl/EgovBackupOpertServiceImpl.java b/src/main/java/egovframework/com/sym/sym/bak/service/impl/EgovBackupOpertServiceImpl.java
index c000d93a5..6258f21f8 100644
--- a/src/main/java/egovframework/com/sym/sym/bak/service/impl/EgovBackupOpertServiceImpl.java
+++ b/src/main/java/egovframework/com/sym/sym/bak/service/impl/EgovBackupOpertServiceImpl.java
@@ -77,7 +77,7 @@ public BackupOpert selectBackupOpert(BackupOpert backupOpert)
return backupOpertDao.selectBackupOpert(backupOpert);
}
- /**
+ /**
* 백업작업의 목록을 조회 한다.
*
* @return 백업작업목록
diff --git a/src/main/java/egovframework/com/sym/sym/bak/service/impl/EgovBackupResultServiceImpl.java b/src/main/java/egovframework/com/sym/sym/bak/service/impl/EgovBackupResultServiceImpl.java
index 5ced56025..16d070e5c 100644
--- a/src/main/java/egovframework/com/sym/sym/bak/service/impl/EgovBackupResultServiceImpl.java
+++ b/src/main/java/egovframework/com/sym/sym/bak/service/impl/EgovBackupResultServiceImpl.java
@@ -69,7 +69,7 @@ public BackupResult selectBackupResult(BackupResult backupResult)
@Override
public List selectBackupResultList(BackupResult searchVO)
throws Exception{
- return dao.selectBackupResultList(searchVO);
+ return dao.selectBackupResultList(searchVO);
}
/**
diff --git a/src/main/java/egovframework/com/sym/sym/bak/web/EgovBackupOpertController.java b/src/main/java/egovframework/com/sym/sym/bak/web/EgovBackupOpertController.java
index 6838a5d89..907c848f1 100644
--- a/src/main/java/egovframework/com/sym/sym/bak/web/EgovBackupOpertController.java
+++ b/src/main/java/egovframework/com/sym/sym/bak/web/EgovBackupOpertController.java
@@ -219,7 +219,7 @@ public String selectBackupOpertForUpdate(@ModelAttribute("searchVO")BackupOpert
return "egovframework/com/sym/sym/bak/EgovBackupOpertUpdt";
}
- /**
+ /**
* 백업작업 목록을 조회한다.
*
* @return 리턴URL
diff --git a/src/main/java/egovframework/com/uss/cmt/service/CmtDefaultVO.java b/src/main/java/egovframework/com/uss/cmt/service/CmtDefaultVO.java
index df596e543..c3a045941 100644
--- a/src/main/java/egovframework/com/uss/cmt/service/CmtDefaultVO.java
+++ b/src/main/java/egovframework/com/uss/cmt/service/CmtDefaultVO.java
@@ -20,9 +20,9 @@
*/
public class CmtDefaultVO implements Serializable {
- private static final long serialVersionUID = -2782974258506027986L;
+ private static final long serialVersionUID = -2782974258506027986L;
- /** 검색조건 */
+ /** 검색조건 */
private String searchCondition = "";
/** 검색Keyword */
@@ -49,166 +49,169 @@ public class CmtDefaultVO implements Serializable {
/** recordCountPerPage */
private int recordCountPerPage = 10;
- /**
- * searchCondition attribute 값을 리턴한다.
- *
- * @return String
- */
- public String getSearchCondition() {
- return searchCondition;
- }
-
- /**
- * searchCondition attribute 값을 설정한다.
- *
- * @param searchCondition String
- */
- public void setSearchCondition(String searchCondition) {
- this.searchCondition = searchCondition;
- }
-
- /**
- * searchKeyword attribute 값을 리턴한다.
- *
- * @return String
- */
- public String getSearchKeyword() {
- return searchKeyword;
- }
-
- /**
- * searchKeyword attribute 값을 설정한다.
- *
- * @param searchKeyword String
- */
- public void setSearchKeyword(String searchKeyword) {
- this.searchKeyword = searchKeyword;
- }
-
- /**
- * searchUseYn attribute 값을 리턴한다.
- *
- * @return String
- */
- public String getSearchUseYn() {
- return searchUseYn;
- }
-
- /**
- * searchUseYn attribute 값을 설정한다.
- *
- * @param searchUseYn String
- */
- public void setSearchUseYn(String searchUseYn) {
- this.searchUseYn = searchUseYn;
- }
-
- /**
- * pageIndex attribute 값을 리턴한다.
- *
- * @return int
- */
- public int getPageIndex() {
- return pageIndex;
- }
-
- /**
- * pageIndex attribute 값을 설정한다.
- *
- * @param pageIndex int
- */
- public void setPageIndex(int pageIndex) {
- this.pageIndex = pageIndex;
- }
-
- /**
- * pageUnit attribute 값을 리턴한다.
- *
- * @return int
- */
- public int getPageUnit() {
- return pageUnit;
- }
-
- /**
- * pageUnit attribute 값을 설정한다.
- *
- * @param pageUnit int
- */
- public void setPageUnit(int pageUnit) {
- this.pageUnit = pageUnit;
- }
-
- /**
- * pageSize attribute 값을 리턴한다.
- *
- * @return int
- */
- public int getPageSize() {
- return pageSize;
- }
-
- /**
- * pageSize attribute 값을 설정한다.
- *
- * @param pageSize int
- */
- public void setPageSize(int pageSize) {
- this.pageSize = pageSize;
- }
-
- /**
- * firstIndex attribute 값을 리턴한다.
- *
- * @return int
- */
- public int getFirstIndex() {
- return firstIndex;
- }
-
- /**
- * firstIndex attribute 값을 설정한다.
- *
- * @param firstIndex int
- */
- public void setFirstIndex(int firstIndex) {
- this.firstIndex = firstIndex;
- }
-
- /**
- * lastIndex attribute 값을 리턴한다.
- *
- * @return int
- */
- public int getLastIndex() {
- return lastIndex;
- }
-
- /**
- * lastIndex attribute 값을 설정한다.
- *
- * @param lastIndex int
- */
- public void setLastIndex(int lastIndex) {
- this.lastIndex = lastIndex;
- }
-
- /**
- * recordCountPerPage attribute 값을 리턴한다.
- *
- * @return int
- */
- public int getRecordCountPerPage() {
- return recordCountPerPage;
- }
-
- /**
- * recordCountPerPage attribute 값을 설정한다.
- *
- * @param recordCountPerPage int
- */
- public void setRecordCountPerPage(int recordCountPerPage) {
- this.recordCountPerPage = recordCountPerPage;
- }
+
+ /**
+ * searchCondition attribute 값을 리턴한다.
+ *
+ * @return String
+ */
+ public String getSearchCondition() {
+ return searchCondition;
+ }
+
+ /**
+ * searchCondition attribute 값을 설정한다.
+ *
+ * @param searchCondition String
+ */
+ public void setSearchCondition(String searchCondition) {
+ this.searchCondition = searchCondition;
+ }
+
+ /**
+ * searchKeyword attribute 값을 리턴한다.
+ *
+ * @return String
+ */
+ public String getSearchKeyword() {
+ return searchKeyword;
+ }
+
+ /**
+ * searchKeyword attribute 값을 설정한다.
+ *
+ * @param searchKeyword String
+ */
+ public void setSearchKeyword(String searchKeyword) {
+ this.searchKeyword = searchKeyword;
+ }
+
+ /**
+ * searchUseYn attribute 값을 리턴한다.
+ *
+ * @return String
+ */
+ public String getSearchUseYn() {
+ return searchUseYn;
+ }
+
+ /**
+ * searchUseYn attribute 값을 설정한다.
+ *
+ * @param searchUseYn String
+ */
+ public void setSearchUseYn(String searchUseYn) {
+ this.searchUseYn = searchUseYn;
+ }
+
+ /**
+ * pageIndex attribute 값을 리턴한다.
+ *
+ * @return int
+ */
+ public int getPageIndex() {
+ return pageIndex;
+ }
+
+ /**
+ * pageIndex attribute 값을 설정한다.
+ *
+ * @param pageIndex int
+ */
+ public void setPageIndex(int pageIndex) {
+ this.pageIndex = pageIndex;
+ }
+
+ /**
+ * pageUnit attribute 값을 리턴한다.
+ *
+ * @return int
+ */
+ public int getPageUnit() {
+ return pageUnit;
+ }
+
+ /**
+ * pageUnit attribute 값을 설정한다.
+ *
+ * @param pageUnit int
+ */
+ public void setPageUnit(int pageUnit) {
+ this.pageUnit = pageUnit;
+ }
+
+ /**
+ * pageSize attribute 값을 리턴한다.
+ *
+ * @return int
+ */
+ public int getPageSize() {
+ return pageSize;
+ }
+
+ /**
+ * pageSize attribute 값을 설정한다.
+ *
+ * @param pageSize int
+ */
+ public void setPageSize(int pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ /**
+ * firstIndex attribute 값을 리턴한다.
+ *
+ * @return int
+ */
+ public int getFirstIndex() {
+ return firstIndex;
+ }
+
+ /**
+ * firstIndex attribute 값을 설정한다.
+ *
+ * @param firstIndex int
+ */
+ public void setFirstIndex(int firstIndex) {
+ this.firstIndex = firstIndex;
+ }
+
+ /**
+ * lastIndex attribute 값을 리턴한다.
+ *
+ * @return int
+ */
+ public int getLastIndex() {
+ return lastIndex;
+ }
+
+ /**
+ * lastIndex attribute 값을 설정한다.
+ *
+ * @param lastIndex int
+ */
+ public void setLastIndex(int lastIndex) {
+ this.lastIndex = lastIndex;
+ }
+
+ /**
+ * recordCountPerPage attribute 값을 리턴한다.
+ *
+ * @return int
+ */
+ public int getRecordCountPerPage() {
+ return recordCountPerPage;
+ }
+
+ /**
+ * recordCountPerPage attribute 값을 설정한다.
+ *
+ * @param recordCountPerPage int
+ */
+ public void setRecordCountPerPage(int recordCountPerPage) {
+ this.recordCountPerPage = recordCountPerPage;
+ }
+
+
}
diff --git a/src/main/java/egovframework/com/uss/cmt/service/EgovCmtManageService.java b/src/main/java/egovframework/com/uss/cmt/service/EgovCmtManageService.java
index 07c0febb2..a63a4fb87 100644
--- a/src/main/java/egovframework/com/uss/cmt/service/EgovCmtManageService.java
+++ b/src/main/java/egovframework/com/uss/cmt/service/EgovCmtManageService.java
@@ -20,36 +20,36 @@
*/
public interface EgovCmtManageService {
- /**
- * 출퇴근정보 목록 화면에 출력
- * @param DeptInfo (부서별 - optional) 검색조건
- * @return List 업무사용자 목록정보
- * @throws Exception
- */
- public List selectCmtInfoList(CmtDefaultVO cmtSearchVO) throws Exception;
+ /**
+ * 출퇴근정보 목록 화면에 출력
+ * @param DeptInfo (부서별 - optional) 검색조건
+ * @return List 업무사용자 목록정보
+ * @throws Exception
+ */
+ public List selectCmtInfoList(CmtDefaultVO cmtSearchVO) throws Exception;
- /**
- * 출근정보 입력, 디바이스를 통해 외부 연계입력가능
- * @param cmtManageVO를 등록정보
- * @return result 등록결과
- * @throws Exception
- */
- public String insertWrkStartCmtInfo(CmtManageVO cmtManageVO) throws Exception;
+ /**
+ * 출근정보 입력, 디바이스를 통해 외부 연계입력가능
+ * @param cmtManageVO를 등록정보
+ * @return result 등록결과
+ * @throws Exception
+ */
+ public String insertWrkStartCmtInfo(CmtManageVO cmtManageVO) throws Exception;
- /**
- * 퇴근정보 입력, 디바이스를 통해 외부 연계입력가능
- * @param cmtManageVO를 등록정보
- * @return result 등록결과
- * @throws Exception
- */
- public int insertWrkEndCmtInfo(CmtManageVO cmtManageVO) throws Exception;
+ /**
+ * 퇴근정보 입력, 디바이스를 통해 외부 연계입력가능
+ * @param cmtManageVO를 등록정보
+ * @return result 등록결과
+ * @throws Exception
+ */
+ public int insertWrkEndCmtInfo(CmtManageVO cmtManageVO) throws Exception;
- /**
- * 퇴근 정보 입력을 위한 wrktm id 확인
- * @param cmtManageVO 검색조건
- * @return 총사용자개수(int)
- * @throws Exception
- */
- public String selectWrktmId(CmtManageVO cmtManageVO) throws Exception;
+ /**
+ * 퇴근 정보 입력을 위한 wrktm id 확인
+ * @param cmtManageVO 검색조건
+ * @return 총사용자개수(int)
+ * @throws Exception
+ */
+ public String selectWrktmId(CmtManageVO cmtManageVO) throws Exception;
}
\ No newline at end of file
diff --git a/src/main/java/egovframework/com/uss/cmt/service/impl/EgovCmtManageDAO.java b/src/main/java/egovframework/com/uss/cmt/service/impl/EgovCmtManageDAO.java
index 17371b369..07d7bdfe8 100644
--- a/src/main/java/egovframework/com/uss/cmt/service/impl/EgovCmtManageDAO.java
+++ b/src/main/java/egovframework/com/uss/cmt/service/impl/EgovCmtManageDAO.java
@@ -27,48 +27,48 @@
@Repository("cmtManageDAO")
public class EgovCmtManageDAO extends EgovComAbstractDAO {
- public List selectCmtInfoList(CmtDefaultVO cmtSearchVO) {
- return selectList("cmtManageDAO.selectCmtList_S", cmtSearchVO);
- }
+ public List selectCmtInfoList(CmtDefaultVO cmtSearchVO) {
+ return selectList("cmtManageDAO.selectCmtList_S", cmtSearchVO);
+ }
- /**
- * 출근 기본정보를 화면에서 입력하여 항목의 정합성을 체크하고 데이터베이스에 저장
- * @param cmtManageVO 업무사용자 등록정보
- * @return String result 등록결과
- */
- public String insertWrkStartCmtInfo(CmtManageVO cmtManageVO) {
- return Integer.toString(insert("cmtManageDAO.insertWrkStartCmtInfo_S", cmtManageVO));
- }
+ /**
+ * 출근 기본정보를 화면에서 입력하여 항목의 정합성을 체크하고 데이터베이스에 저장
+ * @param cmtManageVO 업무사용자 등록정보
+ * @return String result 등록결과
+ */
+ public String insertWrkStartCmtInfo(CmtManageVO cmtManageVO) {
+ return Integer.toString(insert("cmtManageDAO.insertWrkStartCmtInfo_S", cmtManageVO));
+ }
- /**
- * 퇴근 기본정보를 화면에서 입력하여 항목의 정합성을 체크하고 데이터베이스에 저장
- * @param cmtManageVO 업무사용자 등록정보
- * @return String result 등록결과
- */
- public int insertWrkEndCmtInfo(CmtManageVO cmtManageVO) {
- return update("cmtManageDAO.insertWrkEndCmtInfo_S", cmtManageVO);
- }
+ /**
+ * 퇴근 기본정보를 화면에서 입력하여 항목의 정합성을 체크하고 데이터베이스에 저장
+ * @param cmtManageVO 업무사용자 등록정보
+ * @return String result 등록결과
+ */
+ public int insertWrkEndCmtInfo(CmtManageVO cmtManageVO) {
+ return update("cmtManageDAO.insertWrkEndCmtInfo_S", cmtManageVO);
+ }
- /**
- * 퇴근정보 입력을 위한 출근정보 id 조회
- * @param cmtManageVO
- * @return String wrktmId
- */
+ /**
+ * 퇴근정보 입력을 위한 출근정보 id 조회
+ * @param cmtManageVO
+ * @return String wrktmId
+ */
- public String selectWrktmId(CmtManageVO cmtManageVO) {
- return (String) selectOne("cmtManageDAO.selectWrktmId_S", cmtManageVO);
- }
+ public String selectWrktmId(CmtManageVO cmtManageVO) {
+ return (String) selectOne("cmtManageDAO.selectWrktmId_S", cmtManageVO);
+ }
- /**
- * 퇴근정보 입력을 위한 출근정보조회
- * @param cmtManageVO
- * @return cmtManageVO
- */
+ /**
+ * 퇴근정보 입력을 위한 출근정보조회
+ * @param cmtManageVO
+ * @return cmtManageVO
+ */
- public CmtManageVO selectWrkStartInfo(CmtManageVO cmtManageVO) {
- CmtManageVO cmtVO = (CmtManageVO) selectOne("cmtManageDAO.selectWrkStartInfo_S", cmtManageVO);
+ public CmtManageVO selectWrkStartInfo(CmtManageVO cmtManageVO) {
+ CmtManageVO cmtVO = (CmtManageVO) selectOne("cmtManageDAO.selectWrkStartInfo_S", cmtManageVO);
- return cmtVO;
- }
+ return cmtVO;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/egovframework/com/uss/cmt/service/impl/EgovCmtManageServiceImpl.java b/src/main/java/egovframework/com/uss/cmt/service/impl/EgovCmtManageServiceImpl.java
index 284e4b394..65b534634 100644
--- a/src/main/java/egovframework/com/uss/cmt/service/impl/EgovCmtManageServiceImpl.java
+++ b/src/main/java/egovframework/com/uss/cmt/service/impl/EgovCmtManageServiceImpl.java
@@ -35,83 +35,83 @@
@Service("cmtManageService")
public class EgovCmtManageServiceImpl extends EgovAbstractServiceImpl implements EgovCmtManageService {
- /** cmtManageDAO */
- @Resource(name = "cmtManageDAO")
- private EgovCmtManageDAO cmtManageDAO;
-
- /** egovCmtManageIdGnrService */
- @Resource(name = "egovCmtManageIdGnrService")
- private EgovIdGnrService idgenService;
-
- /** EgovMessageSource */
- @Resource(name="egovMessageSource")
- EgovMessageSource egovMessageSource;
-
- /**
- * 출퇴근정보 목록 화면에 출력
- * @param DeptInfo (부서별 - optional) 검색조건
- * @return List 업무사용자 목록정보
- * @throws Exception
- */
- @Override
- public List selectCmtInfoList(CmtDefaultVO cmtSearchVO) throws Exception {
- List result = cmtManageDAO.selectCmtInfoList(cmtSearchVO);
- return result;
- }
-
- /**
- * 출근정보 입력, 디바이스를 통해 외부 연계입력가능
- * @param cmtManageVO를 등록정보
- * @return result 등록결과
- * @throws Exception
- */
- @Override
- public String insertWrkStartCmtInfo(CmtManageVO cmtManageVO) throws Exception {
-
- // Key
- String wrktmId = idgenService.getNextStringId();
- cmtManageVO.setWrktmId(wrktmId);
- // 출근시간
- String formattedStartTime = new SimpleDateFormat("HH:mm").format(Calendar.getInstance().getTime());
- cmtManageVO.setWrkStartTime(formattedStartTime);
-
- return cmtManageDAO.insertWrkStartCmtInfo(cmtManageVO);
- }
-
- /**
- * 퇴근 정보 입력을 위한 wrktm id 확인
- * @param cmtManageVO 검색조건
- * @return 총사용자개수(int)
- * @throws Exception
- */
- @Override
- public String selectWrktmId(CmtManageVO cmtManageVO) throws Exception {
-
- return cmtManageDAO.selectWrktmId(cmtManageVO);
- }
-
- /**
- * 퇴근 정보 입력
- * @param cmtManageVO를 등록정보
- * @return result 등록결과
- * @throws Exception
- */
- @Override
- public int insertWrkEndCmtInfo(CmtManageVO cmtManageVO) throws Exception {
-
- cmtManageVO = cmtManageDAO.selectWrkStartInfo(cmtManageVO);
- //퇴근시간
- String formattedEndTime = new SimpleDateFormat("HH:mm").format(Calendar.getInstance().getTime());
- cmtManageVO.setWrkEndTime(formattedEndTime);
- //회사별 Rule 기반으로 workhour / overtime_workhour를 결정한다. ex) DB 연동활용
- cmtManageVO.setWrkHours("8");
- cmtManageVO.setOvtmwrkHours("0");
- //출퇴근시간 Rule 기반으로 출퇴근상태를 구분한다. ex) 정상/지각/조회
- String msg = egovMessageSource.getMessage("ussCmt.cmtManageServiceImpl.normal");
- cmtManageVO.setWrkStartStatus(msg);
- cmtManageVO.setWrkEndStatus(msg);
-
- return cmtManageDAO.insertWrkEndCmtInfo(cmtManageVO);
- }
+ /** cmtManageDAO */
+ @Resource(name = "cmtManageDAO")
+ private EgovCmtManageDAO cmtManageDAO;
+
+ /** egovCmtManageIdGnrService */
+ @Resource(name = "egovCmtManageIdGnrService")
+ private EgovIdGnrService idgenService;
+
+ /** EgovMessageSource */
+ @Resource(name="egovMessageSource")
+ EgovMessageSource egovMessageSource;
+
+ /**
+ * 출퇴근정보 목록 화면에 출력
+ * @param DeptInfo (부서별 - optional) 검색조건
+ * @return List 업무사용자 목록정보
+ * @throws Exception
+ */
+ @Override
+ public List selectCmtInfoList(CmtDefaultVO cmtSearchVO) throws Exception {
+ List result = (List) cmtManageDAO.selectCmtInfoList(cmtSearchVO);
+ return result;
+ }
+
+ /**
+ * 출근정보 입력, 디바이스를 통해 외부 연계입력가능
+ * @param cmtManageVO를 등록정보
+ * @return result 등록결과
+ * @throws Exception
+ */
+ @Override
+ public String insertWrkStartCmtInfo(CmtManageVO cmtManageVO) throws Exception {
+
+ // Key
+ String wrktmId = idgenService.getNextStringId();
+ cmtManageVO.setWrktmId(wrktmId);
+ // 출근시간
+ String formattedStartTime = new SimpleDateFormat("HH:mm").format(Calendar.getInstance().getTime());
+ cmtManageVO.setWrkStartTime(formattedStartTime);
+
+ return cmtManageDAO.insertWrkStartCmtInfo(cmtManageVO);
+ }
+
+ /**
+ * 퇴근 정보 입력을 위한 wrktm id 확인
+ * @param cmtManageVO 검색조건
+ * @return 총사용자개수(int)
+ * @throws Exception
+ */
+ @Override
+ public String selectWrktmId(CmtManageVO cmtManageVO) throws Exception {
+
+ return cmtManageDAO.selectWrktmId(cmtManageVO);
+ }
+
+ /**
+ * 퇴근 정보 입력
+ * @param cmtManageVO를 등록정보
+ * @return result 등록결과
+ * @throws Exception
+ */
+ @Override
+ public int insertWrkEndCmtInfo(CmtManageVO cmtManageVO) throws Exception {
+
+ cmtManageVO = cmtManageDAO.selectWrkStartInfo(cmtManageVO);
+ //퇴근시간
+ String formattedEndTime = new SimpleDateFormat("HH:mm").format(Calendar.getInstance().getTime());
+ cmtManageVO.setWrkEndTime(formattedEndTime);
+ //회사별 Rule 기반으로 workhour / overtime_workhour를 결정한다. ex) DB 연동활용
+ cmtManageVO.setWrkHours("8");
+ cmtManageVO.setOvtmwrkHours("0");
+ //출퇴근시간 Rule 기반으로 출퇴근상태를 구분한다. ex) 정상/지각/조회
+ String msg = egovMessageSource.getMessage("ussCmt.cmtManageServiceImpl.normal");
+ cmtManageVO.setWrkStartStatus(msg);
+ cmtManageVO.setWrkEndStatus(msg);
+
+ return cmtManageDAO.insertWrkEndCmtInfo(cmtManageVO);
+ }
}
\ No newline at end of file
diff --git a/src/main/java/egovframework/com/uss/cmt/web/EgovCmtManageController.java b/src/main/java/egovframework/com/uss/cmt/web/EgovCmtManageController.java
index c605bbe9a..9a2528c30 100644
--- a/src/main/java/egovframework/com/uss/cmt/web/EgovCmtManageController.java
+++ b/src/main/java/egovframework/com/uss/cmt/web/EgovCmtManageController.java
@@ -23,8 +23,8 @@
import egovframework.com.utl.fcc.service.EgovDateUtil;
/**
- * 업무사용자관련 요청을 비지니스 클래스로 전달하고 처리된 결과를 해당
- * 웹 화면으로 전달하는 Controller를 정의한다
+ * 업무사용자관련 요청을 비지니스 클래스로 전달하고 처리된 결과를 해당
+ * 웹 화면으로 전달하는 Controller를 정의한다
* @author 표준프레임워크 개발팀
* @since 2014.08.29
* @version 1.0
@@ -44,7 +44,7 @@
@Controller
public class EgovCmtManageController {
- /** cmtManageService */
+ /** cmtManageService */
@Resource(name = "cmtManageService")
private EgovCmtManageService cmtManageService;
diff --git a/src/main/java/egovframework/com/uss/ion/bnt/web/EgovBndtManageController.java b/src/main/java/egovframework/com/uss/ion/bnt/web/EgovBndtManageController.java
index 6d346cc4e..d026cea83 100644
--- a/src/main/java/egovframework/com/uss/ion/bnt/web/EgovBndtManageController.java
+++ b/src/main/java/egovframework/com/uss/ion/bnt/web/EgovBndtManageController.java
@@ -479,7 +479,6 @@ public String deleteBndtCeckManage(@ModelAttribute("bndtCeckManage") BndtCeckMan
* @param bndtDiaryVO - 당직일지 VO
* @return String - 리턴 Url
*/
- @SuppressWarnings("unchecked")
@RequestMapping(value = "/uss/ion/bnt/selectBndtDiary.do")
public String selectBndtDiary(@ModelAttribute("bndtDiaryVO") BndtDiaryVO bndtDiaryVO,
@RequestParam Map commandMap,
diff --git a/src/main/java/egovframework/com/uss/ion/fbk/service/EgovFacebookConfig.java b/src/main/java/egovframework/com/uss/ion/fbk/service/EgovFacebookConfig.java
deleted file mode 100644
index bb2b576ab..000000000
--- a/src/main/java/egovframework/com/uss/ion/fbk/service/EgovFacebookConfig.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Spring Social Configuration.
- * @author Keith Donald
- */
-package egovframework.com.uss.ion.fbk.service;
-
-import egovframework.com.cmm.service.EgovProperties;
-import egovframework.com.uss.ion.fbk.service.impl.EgovSimpleConnectionSignUp;
-
-import javax.annotation.Resource;
-import javax.sql.DataSource;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
-import org.springframework.context.annotation.ScopedProxyMode;
-import org.springframework.security.crypto.encrypt.Encryptors;
-import org.springframework.social.connect.ConnectionFactory;
-import org.springframework.social.connect.ConnectionFactoryLocator;
-import org.springframework.social.connect.ConnectionRepository;
-import org.springframework.social.connect.NotConnectedException;
-import org.springframework.social.connect.UsersConnectionRepository;
-import org.springframework.social.connect.jdbc.JdbcUsersConnectionRepository;
-import org.springframework.social.connect.support.ConnectionFactoryRegistry;
-import org.springframework.social.facebook.api.Facebook;
-import org.springframework.social.facebook.connect.FacebookConnectionFactory;
-
-/**
- * @Class Name : EgovFacebookConfig.java
- * @Description : facebook을 위한 JavaConfig
- * @Modification Information
- *
- * 수정일 수정자 수정내용
- * ----------- -------------------- ---------------------------
- * 2014.11.10 표준프레임워크센터 최초 생성
- * @author 표준프레임워크센터
- * @since 2014.11.10
- * @version 3.5
- */
-
-
-@Configuration
-public class EgovFacebookConfig {
-
- private String facebookId = EgovProperties.getProperty("facebook.appId");
-
- private String facebookappSecret = EgovProperties.getProperty("facebook.appSecret");
-
- @Resource(name="social.dataSource")
- private DataSource dataSource;
-
- /**
- * When a new provider is added to the app, register its {@link ConnectionFactory} here.
- * @see FacebookConnectionFactory
- */
- @Bean
- @Scope(value="singleton", proxyMode=ScopedProxyMode.INTERFACES)
- public ConnectionFactoryLocator connectionFactoryLocator() {
- ConnectionFactoryRegistry registry = new ConnectionFactoryRegistry();
- registry.addConnectionFactory(new FacebookConnectionFactory(facebookId, facebookappSecret));
- return registry;
- }
-
- /**
- * Singleton data access object providing access to connections across all users.
- */
- @Bean
- @Scope(value="singleton", proxyMode=ScopedProxyMode.INTERFACES)
- public UsersConnectionRepository usersConnectionRepository() {
- JdbcUsersConnectionRepository repository = new JdbcUsersConnectionRepository(dataSource,
- connectionFactoryLocator(), Encryptors.noOpText());
- repository.setConnectionSignUp(new EgovSimpleConnectionSignUp());
- return repository;
- }
-
- /**
- * Request-scoped data access object providing access to the current user's connections.
- */
- @Bean
- @Scope(value="request", proxyMode=ScopedProxyMode.INTERFACES)
- public ConnectionRepository connectionRepository() {
- FacebookUser user = FacebookSecurityContext.getCurrentUser();
- return usersConnectionRepository().createConnectionRepository(user.getId());
- }
-
- /**
- * A proxy to a request-scoped object representing the current user's primary Facebook account.
- * @throws NotConnectedException if the user is not connected to facebook.
- */
- @Bean
- @Scope(value="request", proxyMode=ScopedProxyMode.INTERFACES)
- public Facebook facebook() {
- return connectionRepository().getPrimaryConnection(Facebook.class).getApi();
- }
-
-}
diff --git a/src/main/java/egovframework/com/uss/ion/fbk/service/FacebookSecurityContext.java b/src/main/java/egovframework/com/uss/ion/fbk/service/FacebookSecurityContext.java
deleted file mode 100644
index 1951b6087..000000000
--- a/src/main/java/egovframework/com/uss/ion/fbk/service/FacebookSecurityContext.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Simple SecurityContext that stores the currently signed-in connection in a thread local.
- * @author Keith Donald
- */
-package egovframework.com.uss.ion.fbk.service;
-
-
-/**
- * SecurityContext 클래스
- * @author 표준프레임워크센터
- * @since 2014.11.10
- * @version 1.0
- * @see
- *
- *
- * << 개정이력(Modification Information) >>
- *
- * 수정일 수정자 수정내용
- * ----------- -------------------- ---------------------------
- * 2014.11.10 표준프레임워크센터 최초 생성
- *
- */
-
-public final class FacebookSecurityContext {
-
- private static final ThreadLocal currentUser = new ThreadLocal();
-
- public static FacebookUser getCurrentUser() {
- FacebookUser user = currentUser.get();
- if (user == null) {
- throw new IllegalStateException("No user is currently signed in");
- }
- return user;
- }
-
- public static void setCurrentUser(FacebookUser user) {
- currentUser.set(user);
- }
-
- public static boolean userSignedIn() {
- return currentUser.get() != null;
- }
-
- public static void remove() {
- currentUser.remove();
- }
-
-}
diff --git a/src/main/java/egovframework/com/uss/ion/fbk/service/FacebookUser.java b/src/main/java/egovframework/com/uss/ion/fbk/service/FacebookUser.java
deleted file mode 100644
index 7c3064c9e..000000000
--- a/src/main/java/egovframework/com/uss/ion/fbk/service/FacebookUser.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Simple little User model.
- * Just stores the user's id for simplicity.
- * @author Keith Donald
- *
- */
-package egovframework.com.uss.ion.fbk.service;
-
-/**
- * facebook userVO 클래스
- * @author 표준프레임워크센터
- * @since 2014.11.10
- * @version 1.0
- * @see
- *
- *
- * << 개정이력(Modification Information) >>
- *
- * 수정일 수정자 수정내용
- * ----------- -------------------- ---------------------------
- * 2014.11.10 표준프레임워크센터 최초 생성
- *
- */
-
-public final class FacebookUser {
-
- private final String id;
-
- public FacebookUser(String id) {
- this.id = id;
- }
-
- public String getId() {
- return id;
- }
-
-}
diff --git a/src/main/java/egovframework/com/uss/ion/fbk/service/impl/EgovSimpleConnectionSignUp.java b/src/main/java/egovframework/com/uss/ion/fbk/service/impl/EgovSimpleConnectionSignUp.java
deleted file mode 100644
index 73756e02d..000000000
--- a/src/main/java/egovframework/com/uss/ion/fbk/service/impl/EgovSimpleConnectionSignUp.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Simple little {@link ConnectionSignUp} command that allocates new userIds in memory.
- * Doesn't bother storing a user record in any local database, since this quickstart just stores the user id in a cookie.
- * @author Keith Donald
- */
-package egovframework.com.uss.ion.fbk.service.impl;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl;
-
-import org.springframework.social.connect.Connection;
-import org.springframework.social.connect.ConnectionSignUp;
-import org.springframework.stereotype.Service;
-
-/**
- * facebook 설정 클래스
- * @author 표준프레임워크센터
- * @since 2014.11.10
- * @version 1.0
- * @see
- *
- *
- * << 개정이력(Modification Information) >>
- *
- * 수정일 수정자 수정내용
- * ----------- -------------------- ---------------------------
- * 2014.11.10 표준프레임워크센터 최초 생성
- *
- */
-
-@Service
-public final class EgovSimpleConnectionSignUp extends EgovAbstractServiceImpl implements ConnectionSignUp {
-
- private final AtomicLong userIdSequence = new AtomicLong();
-
- @Override
- public String execute(Connection connection) {
- return Long.toString(userIdSequence.incrementAndGet());
- }
-
-}
diff --git a/src/main/java/egovframework/com/uss/ion/fbk/web/EgovFacebookController.java b/src/main/java/egovframework/com/uss/ion/fbk/web/EgovFacebookController.java
index 4cc494cc9..c36cb6a3e 100644
--- a/src/main/java/egovframework/com/uss/ion/fbk/web/EgovFacebookController.java
+++ b/src/main/java/egovframework/com/uss/ion/fbk/web/EgovFacebookController.java
@@ -19,12 +19,6 @@
*/
package egovframework.com.uss.ion.fbk.web;
-import javax.inject.Inject;
-
-import org.springframework.social.connect.Connection;
-import org.springframework.social.connect.ConnectionRepository;
-import org.springframework.social.facebook.api.Facebook;
-import org.springframework.social.facebook.api.User;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
@@ -51,45 +45,24 @@
*/
@Controller
public class EgovFacebookController {
-
- private final Facebook facebook;
-
- @Inject
- public EgovFacebookController(Facebook facebook) {
- this.facebook = facebook;
- }
-
- @Inject
- private ConnectionRepository connectionRepository;
-
+
/**
- * facebook 연동을 위한 목록을 보여준다.
+ * facebook 로그인 버튼을 보여준 후, 로그인이 완료되면 연동을 위한 목록을 보여준다.
* @return String - 리턴 Url
*/
@IncludedInfo(name="Facebook 연동",order = 831 ,gid = 50)
- @RequestMapping(value = "/uss/ion/fbk/facebook.do", method = RequestMethod.GET)
+ @RequestMapping(value = "/uss/ion/fbk/EgovFacebookSignin.do", method = RequestMethod.GET)
public String home() {
- return "egovframework/com/uss/ion/fbk/EgovFacebookHome";
+ return "egovframework/com/uss/ion/fbk/EgovFacebookSignin";
}
/**
* facebook 담벼락 목록을 보여준다.
* @return String - 리턴 Url
*/
- @RequestMapping(value="/uss/ion/fbk/feed.do", method=RequestMethod.GET)
- public String showFeed(Model model) {
- model.addAttribute("feed", facebook.feedOperations().getFeed());
- return "egovframework/com/uss/ion/fbk/EgovFacebookFeed";
- }
-
- /**
- * facebook 담벼락 내용을 입력한다.
- * @return String - 리턴 Url
- */
@RequestMapping(value="/uss/ion/fbk/feed.do", method=RequestMethod.POST)
- public String postUpdate(String message) {
- facebook.feedOperations().updateStatus(message);
- return "redirect:/uss/ion/fbk/feed.do";
+ public String showFeed() {
+ return "egovframework/com/uss/ion/fbk/EgovFacebookFeed";
}
/**
@@ -98,18 +71,16 @@ public String postUpdate(String message) {
*/
@RequestMapping(value="/uss/ion/fbk/albums.do", method=RequestMethod.GET)
public String showAlbums(Model model) {
- model.addAttribute("albums", facebook.mediaOperations().getAlbums());
return "egovframework/com/uss/ion/fbk/EgovFacebookAlbums";
}
/**
- * facebook 앨범을 보여준다.
+ * facebook 앨범 내용을 보여준다.
* @return String - 리턴 Url
*/
@RequestMapping(value="/uss/ion/fbk/album/{albumId}", method=RequestMethod.GET)
public String showAlbum(@PathVariable("albumId") String albumId, Model model) {
- model.addAttribute("album", facebook.mediaOperations().getAlbum(albumId));
- model.addAttribute("photos", facebook.mediaOperations().getPhotos(albumId));
+ model.addAttribute("albumId", albumId);
return "egovframework/com/uss/ion/fbk/EgovFacebookAlbum";
}
@@ -119,14 +90,6 @@ public String showAlbum(@PathVariable("albumId") String albumId, Model model) {
*/
@RequestMapping(value="/uss/ion/fbk/profile.do", method=RequestMethod.GET)
public String profile(Model model) {
- Connection connection = connectionRepository.findPrimaryConnection(Facebook.class);
- if (connection == null) {
- return "redirect:/connect/facebook";
- }
- //model.addAttribute("profile", connection.getApi().userOperations().getUserProfile());
- String [] fields = { "id", "email", "first_name", "last_name" };
- User userProfile = facebook.fetchObject("me", User.class, fields);
- model.addAttribute("profile", userProfile);
return "egovframework/com/uss/ion/fbk/EgovFacebookProfile";
}
diff --git a/src/main/java/egovframework/com/uss/ion/fbk/web/FacebookSimpleSignInAdapter.java b/src/main/java/egovframework/com/uss/ion/fbk/web/FacebookSimpleSignInAdapter.java
deleted file mode 100644
index 65a4bfc75..000000000
--- a/src/main/java/egovframework/com/uss/ion/fbk/web/FacebookSimpleSignInAdapter.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Signs the user in by setting the currentUser property on the {@link SecurityContext}.
- * Remembers the sign-in after the current request completes by storing the user's id in a cookie.
- * This is cookie is read in {@link UserInterceptor#preHandle(HttpServletRequest, HttpServletResponse, Object)} on subsequent requests.
- * @author Keith Donald
- * @see UserInterceptor
- *
- */
-package egovframework.com.uss.ion.fbk.web;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang.StringUtils;
-import org.springframework.social.connect.Connection;
-import org.springframework.social.connect.web.SignInAdapter;
-import org.springframework.web.context.request.NativeWebRequest;
-
-import egovframework.com.uss.ion.fbk.service.FacebookSecurityContext;
-import egovframework.com.uss.ion.fbk.service.FacebookUser;
-
-/**
- * facebook 연동 로그인 클래스
- * @author 표준프레임워크센터
- * @since 2014.11.10
- * @version 1.0
- * @see
- *
- *
- * << 개정이력(Modification Information) >>
- *
- * 수정일 수정자 수정내용
- * ----------- -------------------- ---------------------------
- * 2014.11.10 표준프레임워크센터 최초 생성
- * 2022.11.11 김혜준 시큐어코딩 처리
- *
- *
- */
-
-public final class FacebookSimpleSignInAdapter implements SignInAdapter {
-
- @Override
- public String signIn(String userId, Connection connection, NativeWebRequest request) {
- String result = "";
- // 2022.11.11 시큐어코딩 처리
- if (StringUtils.isNotEmpty(userId)) {
- FacebookUserCookieGenerator userCookieGenerator = new FacebookUserCookieGenerator();
- FacebookSecurityContext.setCurrentUser(new FacebookUser(userId));
- HttpServletResponse response = request.getNativeResponse(HttpServletResponse.class);
- if (response != null) {
- userCookieGenerator.addCookie(userId, response);
- result = "success";
- } else {
- result = "failure";
- }
- } else {
- result = "failure";
- }
- return result;
- }
-
-}
diff --git a/src/main/java/egovframework/com/uss/ion/fbk/web/FacebookUserCookieGenerator.java b/src/main/java/egovframework/com/uss/ion/fbk/web/FacebookUserCookieGenerator.java
deleted file mode 100644
index 0fd9e07e1..000000000
--- a/src/main/java/egovframework/com/uss/ion/fbk/web/FacebookUserCookieGenerator.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Utility class for managing the quick_start user cookie that remembers the signed-in user.
- * @author Keith Donald
- *
- */
-package egovframework.com.uss.ion.fbk.web;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.web.util.CookieGenerator;
-
-/**
- * facebook Cookie관리 클래스
- * @author 표준프레임워크센터
- * @since 2014.11.10
- * @version 1.0
- * @see
- *
- *
- * << 개정이력(Modification Information) >>
- *
- * 수정일 수정자 수정내용
- * ----------- -------------------- ---------------------------
- * 2014.11.10 표준프레임워크센터 최초 생성
- *
- */
-
-final class FacebookUserCookieGenerator {
-
- private final CookieGenerator userCookieGenerator = new CookieGenerator();
-
- public FacebookUserCookieGenerator() {
- userCookieGenerator.setCookieName("social_user");
- }
-
- public void addCookie(String userId, HttpServletResponse response) {
- userCookieGenerator.addCookie(response, userId);
- }
-
- public void removeCookie(HttpServletResponse response) {
- userCookieGenerator.addCookie(response, "");
- }
-
- public String readCookieValue(HttpServletRequest request) {
- Cookie[] cookies = request.getCookies();
- if (cookies == null) {
- return null;
- }
- for (Cookie cookie : cookies) {
- if (cookie.getName().equals(userCookieGenerator.getCookieName())) {
- return cookie.getValue();
- }
- }
- return null;
- }
-
-}
diff --git a/src/main/java/egovframework/com/uss/ion/fbk/web/FacebookUserInterceptor.java b/src/main/java/egovframework/com/uss/ion/fbk/web/FacebookUserInterceptor.java
deleted file mode 100644
index f46ceb106..000000000
--- a/src/main/java/egovframework/com/uss/ion/fbk/web/FacebookUserInterceptor.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Before a request is handled:
- * 1. sets the current User in the {@link SecurityContext} from a cookie, if present and the user is still connected to Facebook.
- * 2. requires that the user sign-in if he or she hasn't already.
- * @author Keith Donald
- */
-package egovframework.com.uss.ion.fbk.web;
-
-import egovframework.com.uss.ion.fbk.service.FacebookSecurityContext;
-import egovframework.com.uss.ion.fbk.service.FacebookUser;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.social.connect.UsersConnectionRepository;
-import org.springframework.social.facebook.api.Facebook;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.view.RedirectView;
-
-/**
- * facebook 연결을 확인하는 인터셉터 클래스
- * @author 표준프레임워크센터
- * @since 2014.11.10
- * @version 1.0
- * @see
- *
- *
- * << 개정이력(Modification Information) >>
- *
- * 수정일 수정자 수정내용
- * ----------- -------------------- ---------------------------
- * 2014.11.10 표준프레임워크센터 최초 생성
- *
- */
-
-public final class FacebookUserInterceptor implements HandlerInterceptor {
-
- private final UsersConnectionRepository connectionRepository;
-
- private final FacebookUserCookieGenerator userCookieGenerator = new FacebookUserCookieGenerator();
-
- public FacebookUserInterceptor(UsersConnectionRepository connectionRepository) {
- this.connectionRepository = connectionRepository;
- }
-
- @Override
- public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
- rememberUser(request, response);
- handleSignOut(request, response);
- if (FacebookSecurityContext.userSignedIn() || requestForSignIn(request)) {
- return true;
- } else {
- return requireSignIn(request, response);
- }
- }
-
- @Override
- public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
- FacebookSecurityContext.remove();
- }
-
- // internal helpers
-
- private void rememberUser(HttpServletRequest request, HttpServletResponse response) {
- String userId = userCookieGenerator.readCookieValue(request);
- if (userId == null || userId == "") {
- return;
- }
- if (!userNotFound(userId)) {
- userCookieGenerator.removeCookie(response);
- return;
- }
- FacebookSecurityContext.setCurrentUser(new FacebookUser(userId));
- }
-
- private void handleSignOut(HttpServletRequest request, HttpServletResponse response) {
- if (FacebookSecurityContext.userSignedIn() && request.getServletPath().startsWith("/uss/ion/fbk/facebookSignout.do")) {
- connectionRepository.createConnectionRepository(FacebookSecurityContext.getCurrentUser().getId()).removeConnections("facebook");
- userCookieGenerator.removeCookie(response);
- FacebookSecurityContext.remove();
- }
- }
-
- private boolean requestForSignIn(HttpServletRequest request) {
- return request.getServletPath().startsWith("/uss/ion/fbk/facebookSignin.do");
- }
-
- private boolean requireSignIn(HttpServletRequest request, HttpServletResponse response) throws Exception {
- new RedirectView("/uss/ion/fbk/facebookSignin.do", true).render(null, request, response);
- return false;
- }
-
- private boolean userNotFound(String userId) {
- // doesn't bother checking a local user database: simply checks if the userId is connected to Facebook
- return connectionRepository.createConnectionRepository(userId).findPrimaryConnection(Facebook.class) != null;
- }
-
-}
diff --git a/src/main/java/egovframework/com/uss/ion/isg/web/EgovIntnetSvcGuidanceController.java b/src/main/java/egovframework/com/uss/ion/isg/web/EgovIntnetSvcGuidanceController.java
index db4d32742..694098fc5 100644
--- a/src/main/java/egovframework/com/uss/ion/isg/web/EgovIntnetSvcGuidanceController.java
+++ b/src/main/java/egovframework/com/uss/ion/isg/web/EgovIntnetSvcGuidanceController.java
@@ -14,8 +14,9 @@
*
* 수정일 수정자 수정내용
* ------- -------- ---------------------------
- * 2010.8.3 lee.m.j 최초 생성
- * 2011.8.26 정진오 IncludedInfo annotation 추가
+ * 2010.08.03 lee.m.j 최초 생성
+ * 2011.08.26 정진오 IncludedInfo annotation 추가
+ * 2023.06.09 김수용 NSR 보안조치 (특수문자 복원 기능 제거)
*
*
*/
@@ -222,7 +223,7 @@ public String selectIntnetSvcGuidanceResult(@ModelAttribute("intnetSvcGuidanceVO
List intnetSvcGuidanceList = egovIntnetSvcGuidanceService.selectIntnetSvcGuidanceResult(intnetSvcGuidanceVO);
for(int i=0; i
- * << 개정이력(Modification Information) >>
- *
- * 수정일 수정자 수정내용
- * ------- -------- ---------------------------
- * 2009.07.03 장동한 최초 생성
- *
- *
- */
-public interface EgovTwitterRecptnService {
-
- /**
- * 트위터 목록을 조회한다.
- * @param sTwitterId -트위터 아이디
- * @param sTwitterPw -트위터 비밀번호
- * @param nPageSize -페이징 개수
- * @return List -조회 결과
- * @throws Exception -Exception Throws
- */
- public List twitterRecptnList(Map map, int nPageSize) throws Exception;
-
-}
diff --git a/src/main/java/egovframework/com/uss/ion/tir/service/EgovTwitterTrnsmitService.java b/src/main/java/egovframework/com/uss/ion/tir/service/EgovTwitterTrnsmitService.java
index 5e51045a6..f9dfc2911 100644
--- a/src/main/java/egovframework/com/uss/ion/tir/service/EgovTwitterTrnsmitService.java
+++ b/src/main/java/egovframework/com/uss/ion/tir/service/EgovTwitterTrnsmitService.java
@@ -2,6 +2,7 @@
import java.util.Map;
+import twitter4j.CreateTweetResponse;
import twitter4j.Status;
/**
* 트위터송신을 처리하는 Service Class 구현
@@ -28,7 +29,7 @@ public interface EgovTwitterTrnsmitService {
* @param sTwitterPw -트위터 비밀번호
* @param sTwitterText -트위터 등록 메세지
*/
- public Status twitterTrnsmitRegist(Map map, String sTwitterText) throws Exception;
+ public CreateTweetResponse twitterTrnsmitRegist(Map map, String sTwitterText) throws Exception;
/**
* 트위터 계정을 건수를 조회 한다.
@@ -63,5 +64,17 @@ public interface EgovTwitterTrnsmitService {
* @param param - 조회할 정보가 담긴 Map
*/
public void deleteTwitterAccount(Map param) throws Exception;
+
+ /**
+ * 트위터 계정을 조회한다.
+ * @param map - 인증 정보가 담긴 Map
+ * */
+ public Map twitterUserAccount(Map map) throws Exception;
+
+ /**
+ * 전송한 트윗을 삭제한다.
+ * @param map - 인증 정보가 담긴 Map
+ **/
+ public boolean twitterDelete(Map map, String tID) throws Exception;
}
diff --git a/src/main/java/egovframework/com/uss/ion/tir/service/TwitterInfo.java b/src/main/java/egovframework/com/uss/ion/tir/service/TwitterInfo.java
index 19ad7d1ff..b40d9c4d6 100644
--- a/src/main/java/egovframework/com/uss/ion/tir/service/TwitterInfo.java
+++ b/src/main/java/egovframework/com/uss/ion/tir/service/TwitterInfo.java
@@ -1,6 +1,7 @@
package egovframework.com.uss.ion.tir.service;
import java.io.Serializable;
+import java.util.Date;
import egovframework.com.cmm.ComDefaultVO;
@@ -22,7 +23,7 @@
public class TwitterInfo extends ComDefaultVO implements Serializable{
/** 트위터 아이디 */
- private String twitterId;
+ private Long twitterId;
/** 트위터 비밀번호 */
private String twitterPw;
@@ -40,25 +41,37 @@ public class TwitterInfo extends ComDefaultVO implements Serializable{
private String twitterText;
/** 트위터 등록일 */
- private String twitterCreatedAt;
+ private Date twitterCreatedAt;
/** 트위터 프로파일 이미지명 */
private String twitterProfileImageURL;
/** 트위터 소스 */
private String twitterSource;
+
+ /** 등록한 트윗 아이디*/
+ /* 2023 08 23 추가*/
+ private Long twitterTweetId;
+
+ public Long getTwitterTweetId() {
+ return twitterTweetId;
+ }
+
+ public void setTwitterTweetId(Long twitterTweetId) {
+ this.twitterTweetId = twitterTweetId;
+ }
/**
* @return the twitterId
*/
- public String getTwitterId() {
+ public Long getTwitterId() {
return twitterId;
}
/**
* @param twitterId the twitterId to set
*/
- public void setTwitterId(String twitterId) {
+ public void setTwitterId(Long twitterId) {
this.twitterId = twitterId;
}
@@ -135,15 +148,15 @@ public void setTwitterText(String twitterText) {
/**
* @return the twitterCreatedAt
*/
- public String getTwitterCreatedAt() {
+ public Date getTwitterCreatedAt() {
return twitterCreatedAt;
}
/**
- * @param twitterCreatedAt the twitterCreatedAt to set
+ * @param date the twitterCreatedAt to set
*/
- public void setTwitterCreatedAt(String twitterCreatedAt) {
- this.twitterCreatedAt = twitterCreatedAt;
+ public void setTwitterCreatedAt(Date date) {
+ this.twitterCreatedAt = date;
}
/**
diff --git a/src/main/java/egovframework/com/uss/ion/tir/service/impl/EgovTwitterRecptnServiceImpl.java b/src/main/java/egovframework/com/uss/ion/tir/service/impl/EgovTwitterRecptnServiceImpl.java
deleted file mode 100644
index 878544323..000000000
--- a/src/main/java/egovframework/com/uss/ion/tir/service/impl/EgovTwitterRecptnServiceImpl.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package egovframework.com.uss.ion.tir.service.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import egovframework.com.uss.ion.tir.service.EgovTwitterRecptnService;
-import egovframework.com.uss.ion.tir.service.TwitterInfo;
-
-import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl;
-
-import org.springframework.stereotype.Service;
-
-import twitter4j.Paging;
-import twitter4j.Status;
-import twitter4j.Twitter;
-import twitter4j.TwitterFactory;
-import twitter4j.auth.AccessToken;
-//import twitter4j.conf.Configuration;
-//import twitter4j.conf.ConfigurationBuilder;
-/**
- * 트위터수신을 처리하는 ServiceImpl Class 구현
- * @author 공통서비스 장동한
- * @since 2010.06.16
- * @version 1.0
- * @see
- * << 개정이력(Modification Information) >>
- *
- * 수정일 수정자 수정내용
- * ------- -------- ---------------------------
- * 2009.07.03 장동한 최초 생성
- *
- *
- */
-@Service("egovTwitterRecptnService")
-public class EgovTwitterRecptnServiceImpl extends EgovAbstractServiceImpl
- implements EgovTwitterRecptnService {
-
- /**
- * 트위터 목록을 조회한다.
- * @param sTwitterId -트위터 아이디
- * @param sTwitterPw -트위터 비밀번호
- * @param nPageSize -페이징 개수
- * @return List -조회 결과
- * @throws Exception -Exception Throws
- */
- @Override
- @SuppressWarnings({ "rawtypes", "unchecked" })
- public List twitterRecptnList(Map map, int nPageSize) throws Exception {
-
- String sCONSUMER_KEY = (String)map.get("sCONSUMER_KEY");
- String sCONSUMER_SECRET = (String)map.get("sCONSUMER_SECRET");
-
- //트위터 객체선언
- Twitter twitter = new TwitterFactory().getInstance();
-
- //CONSUMER KEY, CONSUMER SECRET 설정
- twitter.setOAuthConsumer(sCONSUMER_KEY, sCONSUMER_SECRET);
- //twitter.setOAuthConsumer((String)map.get("sCONSUMER_KEY"), (String)map.get("sCONSUMER_SECRET"));
- //엑서스 토큰 키 설정
- AccessToken accessToken = new AccessToken((String)map.get("atoken"), (String)map.get("astoken"));
-
- //엑서스 토큰 설정
- twitter.setOAuthAccessToken(accessToken);
-
- //트위터 Status 객체
- List statuses;
- //반환 트위터 모록
- List listRtn = new ArrayList();
- //트위터 페이징 객체
- Paging page = new Paging();
- //페이지 개수 설정
- page.count(nPageSize);
- //인덱스 설정
- page.setPage(1);
- //트위터 타임라인 설정
- statuses = twitter.getUserTimeline(page);
- //statuses = twitter.getUserTimeline(new Paging(1, nPageSize));
- //statuses = twitter.getFriendsTimeline((new Paging(1, nPageSize));
-
- for(Status status : statuses) {
-
- //트위터 정보 객체 선언
- TwitterInfo twitterInfo = new TwitterInfo();
- // 트위터 이름
- twitterInfo.setTwitterNmae(status.getUser().getName());
- // 트위터 스크린명
- twitterInfo.setTwitterScreenName(status.getUser().getScreenName());
- // 트위터 URL
- twitterInfo.setTwitterURL( String.valueOf(status.getUser().getURL()) );
- // 트위터 텍스트
- twitterInfo.setTwitterText(status.getText());
- ///DATE -> 변환을 하기위한 SimpleDateFormat 설정
- java.text.SimpleDateFormat format = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- // 트위터 등록일
- twitterInfo.setTwitterCreatedAt( format.format(status.getCreatedAt()) );
- // 트위터 프로파일 이미지명
- twitterInfo.setTwitterProfileImageURL(String.valueOf(status.getUser().getProfileImageURL()));
- // 트위터 소스 status.getSource()
- twitterInfo.setTwitterSource("");
-
- listRtn.add(twitterInfo);
- }
-
-
- return listRtn;
- }
-
-}
diff --git a/src/main/java/egovframework/com/uss/ion/tir/service/impl/EgovTwitterTrnsmitServiceImpl.java b/src/main/java/egovframework/com/uss/ion/tir/service/impl/EgovTwitterTrnsmitServiceImpl.java
index 6fa459353..8d02429e6 100644
--- a/src/main/java/egovframework/com/uss/ion/tir/service/impl/EgovTwitterTrnsmitServiceImpl.java
+++ b/src/main/java/egovframework/com/uss/ion/tir/service/impl/EgovTwitterTrnsmitServiceImpl.java
@@ -1,5 +1,7 @@
package egovframework.com.uss.ion.tir.service.impl;
+import java.util.Date;
+import java.util.HashMap;
import java.util.Map;
import javax.annotation.Resource;
@@ -8,9 +10,15 @@
import egovframework.com.uss.ion.tir.service.EgovTwitterTrnsmitService;
import org.egovframe.rte.fdl.cmmn.EgovAbstractServiceImpl;
+
+import twitter4j.BooleanResponse;
+import twitter4j.CreateTweetResponse;
import twitter4j.Status;
import twitter4j.Twitter;
import twitter4j.TwitterFactory;
+import twitter4j.TwitterV2;
+import twitter4j.TwitterV2ExKt;
+import twitter4j.UsersResponse;
import twitter4j.auth.AccessToken;
//import twitter4j.conf.Configuration;
//import twitter4j.conf.ConfigurationBuilder;
@@ -43,7 +51,7 @@ public class EgovTwitterTrnsmitServiceImpl extends EgovAbstractServiceImpl
* @param sTwitterText -트위터 등록 메세지
*/
@Override
- public Status twitterTrnsmitRegist(Map map, String sTwitterText) throws Exception{
+ public CreateTweetResponse twitterTrnsmitRegist(Map map, String sTwitterText) throws Exception{
String sCONSUMER_KEY = (String)map.get("sCONSUMER_KEY");
String sCONSUMER_SECRET = (String)map.get("sCONSUMER_SECRET");
@@ -55,9 +63,81 @@ public Status twitterTrnsmitRegist(Map map, String sTwitterText) throws Ex
AccessToken accessToken = new AccessToken((String)map.get("atoken"), (String)map.get("astoken"));
//엑서스 토큰 설정
twitter.setOAuthAccessToken(accessToken);
+
//트위터 글 게시
- return twitter.updateStatus(sTwitterText);
+ final TwitterV2 v2 = TwitterV2ExKt.getV2(twitter);
+ final CreateTweetResponse tweets = v2.createTweet(null, null, null, null, null, null, null, null, null, null, null, sTwitterText);
+
+ return tweets;
+
+ }
+
+ /**
+ * 트위터 계정 정보를 조회한다.
+ * @param map - 인증 정보가 담긴 Map
+ */
+ @Override
+ public Map twitterUserAccount(Map map) throws Exception {
+
+ // 유저정보
+ String sCONSUMER_KEY = (String)map.get("sCONSUMER_KEY");
+ String sCONSUMER_SECRET = (String)map.get("sCONSUMER_SECRET");
+ //트위터 객체선언
+ Twitter twitter = new TwitterFactory().getInstance();
+ //CONSUMER KEY, CONSUMER SECRET 설정
+ twitter.setOAuthConsumer(sCONSUMER_KEY, sCONSUMER_SECRET);
+ //엑서스 토큰 키 설정
+ AccessToken accessToken = new AccessToken((String)map.get("atoken"), (String)map.get("astoken"));
+ //엑서스 토큰 설정
+ twitter.setOAuthAccessToken(accessToken);
+
+ final TwitterV2 v2 = TwitterV2ExKt.getV2(twitter);
+
+ final UsersResponse users = v2.getMe("pinned_tweet_id", "author_id", "created_at,profile_image_url");
+
+ Long userId = users.getUsers().get(0).getId();
+ String userName = users.getUsers().get(0).getName();
+ String userScreenName = users.getUsers().get(0).getScreenName();
+ Date userCreate_at = users.getUsers().get(0).getCreatedAt();
+ String userProfile_url = users.getUsers().get(0).getProfileImageUrl();
+
+ Map userResult = new HashMap();
+ userResult.put("userId", userId);
+ userResult.put("userName", userName);
+ userResult.put("userScreenName", userScreenName);
+ userResult.put("userCreate_At", userCreate_at);
+ userResult.put("userProfile_url", userProfile_url);
+
+ return userResult;
+ }
+ /**
+ * 트윗 내용삭제
+ *
+ */
+ @Override
+ public boolean twitterDelete(Map map, String tID) throws Exception {
+
+ System.out.println("아이디 >>> " + tID );
+
+ String sCONSUMER_KEY = (String)map.get("sCONSUMER_KEY");
+ String sCONSUMER_SECRET = (String)map.get("sCONSUMER_SECRET");
+ //트위터 객체선언
+ Twitter twitter = new TwitterFactory().getInstance();
+ //CONSUMER KEY, CONSUMER SECRET 설정
+ twitter.setOAuthConsumer(sCONSUMER_KEY, sCONSUMER_SECRET);
+ //엑서스 토큰 키 설정
+ AccessToken accessToken = new AccessToken((String)map.get("atoken"), (String)map.get("astoken"));
+ //엑서스 토큰 설정
+ twitter.setOAuthAccessToken(accessToken);
+
+ final TwitterV2 v2 = TwitterV2ExKt.getV2(twitter);
+ final BooleanResponse deleteResult = v2.deleteTweet(Long.parseLong(tID));
+
+ System.out.println("deleteResult >>> " + deleteResult);
+
+ return deleteResult.getResult();
+
}
/**
diff --git a/src/main/java/egovframework/com/uss/ion/tir/web/EgovTwitterController.java b/src/main/java/egovframework/com/uss/ion/tir/web/EgovTwitterController.java
index f754c2f56..f62697c15 100644
--- a/src/main/java/egovframework/com/uss/ion/tir/web/EgovTwitterController.java
+++ b/src/main/java/egovframework/com/uss/ion/tir/web/EgovTwitterController.java
@@ -1,5 +1,6 @@
package egovframework.com.uss.ion.tir.web;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -10,7 +11,6 @@
//import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
@@ -21,18 +21,14 @@
import egovframework.com.cmm.LoginVO;
import egovframework.com.cmm.annotation.IncludedInfo;
import egovframework.com.cmm.util.EgovUserDetailsHelper;
-import egovframework.com.uss.ion.tir.service.EgovTwitterRecptnService;
import egovframework.com.uss.ion.tir.service.EgovTwitterTrnsmitService;
import egovframework.com.uss.ion.tir.service.TwitterInfo;
import egovframework.com.utl.fcc.service.EgovStringUtil;
import org.egovframe.rte.fdl.property.EgovPropertyService;
-import org.egovframe.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import twitter4j.Twitter;
-import twitter4j.TwitterFactory;
-import twitter4j.auth.AccessToken;
+import twitter4j.CreateTweetResponse;
/**
* 트위터 수신, 송신를 처리하는 Controller Class 구현
@@ -65,10 +61,6 @@ public class EgovTwitterController {
@Resource(name = "propertiesService")
protected EgovPropertyService propertiesService;
- /** 트위터 수신(조회) 서비스 */
- @Resource(name = "egovTwitterRecptnService")
- private EgovTwitterRecptnService egovTwitterRecptnService;
-
/** 트위터 송신(목록) 서비스 */
@Resource(name = "egovTwitterTrnsmitService")
private EgovTwitterTrnsmitService egovTwitterTrnsmitService;
@@ -284,92 +276,35 @@ public String EgovTwitterPopupProcess(ModelMap model) throws Exception {
return "egovframework/com/uss/ion/tir/EgovTwitterPopupProcess";
}
+
/**
- * 트위터를 수신을 조회 처리한다.
- * @param searchVO -트위터 Model
- * @param commandMap -Request Variable
- * @param twitterInfo -트위터 Model
+ * 트위터를 송신 페이지를 조회 한다.
* @param model -Spring 제공하는 ModelMap
- * @param request -HttpServletRequest 객체
- * @param response -HttpServletResponse 객체
* @return String -리턴 URL
* @throws Exception -Exception Throws
*/
- @RequestMapping(value = "/uss/ion/tir/listTwitterRecptn.do")
- public String EgovTwitterRecptnPost(@ModelAttribute("searchVO") TwitterInfo searchVO, @ModelAttribute("twitterInfo") TwitterInfo twitterInfo, HttpServletRequest request,
- HttpServletResponse response, ModelMap model) throws Exception {
-
- //리턴 URL
- String sLocationUrl = "egovframework/com/uss/ion/tir/EgovTwitterRecptn";
-
- /** 페이징 정보 설정 */
- searchVO.setPageUnit(propertiesService.getInt("pageUnit"));
- searchVO.setPageSize(propertiesService.getInt("pageSize"));
-
- /** 네비게이션 정보 설정 */
- PaginationInfo paginationInfo = new PaginationInfo();
- paginationInfo.setCurrentPageNo(searchVO.getPageIndex());
- paginationInfo.setRecordCountPerPage(searchVO.getPageUnit());
- paginationInfo.setPageSize(searchVO.getPageSize());
-
- /** 페이징 정보 설정 */
- searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
- searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
- searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
-
+ @RequestMapping(value = "/uss/ion/tir/registTwitterTrnsmit.do", method = RequestMethod.GET)
+ public String EgovTwitterTrnsmitGet(ModelMap model, HttpServletRequest request) throws Exception {
+
String sCONSUMER_KEY = (String) WebUtils.getSessionAttribute(request, "sCONSUMER_KEY");
String sCONSUMER_SECRET = (String) WebUtils.getSessionAttribute(request, "sCONSUMER_SECRET");
String atoken = (String) WebUtils.getSessionAttribute(request, "atoken");
String astoken = (String) WebUtils.getSessionAttribute(request, "astoken");
- int nPageSize = 50;
-
- HashMap hmParam = new HashMap();
-
- if (request.getParameter("pageSize") != null) {
- if (!request.getParameter("pageSize").equals("")) {
- nPageSize = Integer.parseInt(String.valueOf(request.getParameter("pageSize")));
- }
- }
-
- //인증키값 설정
+ HashMap hmParam = new HashMap();
+ // 인증키값 설정
hmParam.put("sCONSUMER_KEY", sCONSUMER_KEY);
hmParam.put("sCONSUMER_SECRET", sCONSUMER_SECRET);
hmParam.put("atoken", atoken);
hmParam.put("astoken", astoken);
- //트위터 객체선언
- Twitter twitter = new TwitterFactory().getInstance();
- twitter.setOAuthConsumer(sCONSUMER_KEY, sCONSUMER_SECRET);
-
- //CONSUMER KEY, CONSUMER SECRET 설정
- //twitter.setOAuthConsumer(sCONSUMER_KEY, sCONSUMER_SECRET);
- //엑서스 토큰 키 설정
- AccessToken accessToken = new AccessToken(atoken, astoken);
- //엑서스 토큰 설정
- twitter.setOAuthAccessToken(accessToken);
-
- //twitter.verifyCredentials();
- //twitter.getFriendsTimeline().subList(0, 100);
-
- model.addAttribute("resultList", egovTwitterRecptnService.twitterRecptnList(hmParam, nPageSize));
- model.addAttribute("pageSize", nPageSize); //전체 페이지 개수
-
- return sLocationUrl;
-
- }
-
- /**
- * 트위터를 송신 페이지를 조회 한다.
- * @param model -Spring 제공하는 ModelMap
- * @return String -리턴 URL
- * @throws Exception -Exception Throws
- */
- @RequestMapping(value = "/uss/ion/tir/registTwitterTrnsmit.do", method = RequestMethod.GET)
- public String EgovTwitterTrnsmitGet(ModelMap model) throws Exception {
+ Map userResult = egovTwitterTrnsmitService.twitterUserAccount(hmParam); // 유저정보
+ model.addAttribute("userID", userResult.get("userName"));
+ model.addAttribute("userName", userResult.get("userScreenName"));
model.addAttribute("twitterInfo", new TwitterInfo());
+
return "egovframework/com/uss/ion/tir/EgovTwitterTrnsmit";
}
@@ -385,7 +320,8 @@ public String EgovTwitterTrnsmitGet(ModelMap model) throws Exception {
* @throws Exception -Exception Throws
*/
@RequestMapping(value = "/uss/ion/tir/registTwitterTrnsmit.do", method = RequestMethod.POST)
- public String EgovTwitterTrnsmitPost(TwitterInfo twitterInfo, HttpServletRequest request, HttpServletResponse response, ModelMap model) throws Exception {
+ public String EgovTwitterTrnsmitPost(TwitterInfo twitterInfo, HttpServletRequest request,
+ HttpServletResponse response, ModelMap model) throws Exception {
String sCONSUMER_KEY = (String) WebUtils.getSessionAttribute(request, "sCONSUMER_KEY");
String sCONSUMER_SECRET = (String) WebUtils.getSessionAttribute(request, "sCONSUMER_SECRET");
@@ -393,19 +329,60 @@ public String EgovTwitterTrnsmitPost(TwitterInfo twitterInfo, HttpServletRequest
String atoken = (String) WebUtils.getSessionAttribute(request, "atoken");
String astoken = (String) WebUtils.getSessionAttribute(request, "astoken");
- HashMap hmParam = new HashMap();
+ HashMap hmParam = new HashMap();
- //인증키값 설정
+ // 인증키값 설정
hmParam.put("sCONSUMER_KEY", sCONSUMER_KEY);
hmParam.put("sCONSUMER_SECRET", sCONSUMER_SECRET);
hmParam.put("atoken", atoken);
hmParam.put("astoken", astoken);
- LOGGER.info("[Controller]===>>> atoken = "+atoken);
- LOGGER.info("[Controller]===>>> astoken = "+astoken);
- //트위터 글 게시
- twitter4j.Status status = egovTwitterTrnsmitService.twitterTrnsmitRegist(hmParam, twitterInfo.getTwitterText());
- model.addAttribute("status", status);
+ LOGGER.info("[Controller]===>>> atoken = " + atoken);
+ LOGGER.info("[Controller]===>>> astoken = " + astoken);
+
+ // 트위터 글 게시
+ CreateTweetResponse tweetResult = egovTwitterTrnsmitService.twitterTrnsmitRegist(hmParam,
+ twitterInfo.getTwitterText());
+ Map userResult = egovTwitterTrnsmitService.twitterUserAccount(hmParam); // 유저정보
+
+ twitterInfo.setTwitterTweetId(tweetResult.getId());
+ twitterInfo.setTwitterText(tweetResult.getText());
+ twitterInfo.setTwitterId((Long) userResult.get("userId"));
+ twitterInfo.setTwitterScreenName(userResult.get("userScreenName").toString());
+ twitterInfo.setTwitterNmae(userResult.get("userName").toString());
+ twitterInfo.setTwitterCreatedAt((Date) userResult.get("userCreate_At"));
+ twitterInfo.setTwitterProfileImageURL(userResult.get("userProfile_url").toString());
+
+ model.addAttribute("twitterInfo", twitterInfo);
return "egovframework/com/uss/ion/tir/EgovTwitterTrnsmitResult";
}
+
+ @RequestMapping(value = "/uss/ion/tir/twitterDelete.do")
+ public String deleteTweet(@RequestParam("tweetID") String tID, HttpServletRequest request) throws Exception {
+
+ tID = tID.replace(""", "");
+ LOGGER.info("트윗 아이디 >>> " + tID);
+
+ String sCONSUMER_KEY = (String) WebUtils.getSessionAttribute(request, "sCONSUMER_KEY");
+ String sCONSUMER_SECRET = (String) WebUtils.getSessionAttribute(request, "sCONSUMER_SECRET");
+
+ String atoken = (String) WebUtils.getSessionAttribute(request, "atoken");
+ String astoken = (String) WebUtils.getSessionAttribute(request, "astoken");
+
+ HashMap hmParam = new HashMap();
+
+ // 인증키값 설정
+ hmParam.put("sCONSUMER_KEY", sCONSUMER_KEY);
+ hmParam.put("sCONSUMER_SECRET", sCONSUMER_SECRET);
+ hmParam.put("atoken", atoken);
+ hmParam.put("astoken", astoken);
+
+ boolean deleteResult = egovTwitterTrnsmitService.twitterDelete(hmParam, tID);
+
+ LOGGER.info("트윗 삭제");
+ LOGGER.info("DELETERESULT >>> " + deleteResult);
+
+ return "egovframework/com/uss/ion/tir/EgovTwitterMain";
+
+ }
}
diff --git a/src/main/java/egovframework/com/uss/ion/vct/web/EgovVcatnManageController.java b/src/main/java/egovframework/com/uss/ion/vct/web/EgovVcatnManageController.java
index b4fafd4cf..6b838e8c4 100644
--- a/src/main/java/egovframework/com/uss/ion/vct/web/EgovVcatnManageController.java
+++ b/src/main/java/egovframework/com/uss/ion/vct/web/EgovVcatnManageController.java
@@ -46,7 +46,7 @@
* 수정일 수정자 수정내용
* ------- -------- ---------------------------
* 2009.6.15 이용 최초 생성
- * 2011.8.26 정진오 IncludedInfo annotation 추가
+ * 2011.8.26 정진오 IncludedInfo annotation 추가
*
*
*/
@@ -54,7 +54,7 @@
@Controller
public class EgovVcatnManageController {
- @Resource(name = "egovMessageSource")
+ @Resource(name = "egovMessageSource")
EgovMessageSource egovMessageSource;
@Resource(name = "egovVcatnManageService")
diff --git a/src/main/java/egovframework/com/uss/ion/yrc/web/EgovIndvdlYrycManageController.java b/src/main/java/egovframework/com/uss/ion/yrc/web/EgovIndvdlYrycManageController.java
index a2eeac535..427908912 100644
--- a/src/main/java/egovframework/com/uss/ion/yrc/web/EgovIndvdlYrycManageController.java
+++ b/src/main/java/egovframework/com/uss/ion/yrc/web/EgovIndvdlYrycManageController.java
@@ -49,87 +49,87 @@ public class EgovIndvdlYrycManageController {
@Autowired
private DefaultBeanValidator beanValidator;
- /**
- * 개인연차관리정보를 관리하기 위해 등록된 개인연차관리 목록을 조회한다.
- *
- * @param IndvdlYrycManage - 개인연차관리 VO
- * @return String - 리턴 Url
- */
- @IncludedInfo(name = "개인연차관리", order = 902, gid = 50)
- @RequestMapping(value = "/uss/ion/yrc/EgovIndvdlYrycManageList.do")
- public String selectIndvdlYrycManageList(IndvdlYrycManage indvdlYrycManage, ModelMap model) throws Exception {
-
- LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
- if (user == null) {
- return "redirect:/uat/uia/egovLoginUsr.do";
- }
-
- indvdlYrycManage.setMberId(user.getUniqId());
-
- List resultList = egovIndvdlYrycManageService.selectIndvdlYrycManageList(indvdlYrycManage);
- model.addAttribute("resultList", resultList);
-
- return "egovframework/com/uss/ion/yrc/EgovIndvdlYrycManageList";
- }
-
- /**
- * 개인별연차관리 등록 화면으로 이동한다.
- *
- * @param indvdlYrycManage - 연차관리 model
- * @return String - 리턴 Url
- */
- @RequestMapping(value = "/uss/ion/yrc/EgovIndvdlYrycRegist.do", method = RequestMethod.GET)
- public String insertViewIndvdlYrycManage(@ModelAttribute IndvdlYrycManage indvdlYrycManage, ModelMap model) throws Exception {
-
- LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
- indvdlYrycManage.setMberId(user == null ? "" : EgovStringUtil.isNullToString(user.getUniqId()));
- indvdlYrycManage.setMberNm(user == null ? "" : EgovStringUtil.isNullToString(user.getName()));
-
- List resultList = egovIndvdlYrycManageService.selectIndvdlYrycManageList(indvdlYrycManage);
- indvdlYrycManage.setOccrrncYear(EgovDateUtil.getCurrentYearAsString());
-
- int totCnt = egovIndvdlYrycManageService.selectIndvdlYrycManageListTotCnt(indvdlYrycManage);
-
- model.addAttribute("resultList", resultList);
- model.addAttribute("totCnt", totCnt);
-
- return "egovframework/com/uss/ion/yrc/EgovIndvdlYrycRegist";
- }
-
- /**
- * 개인별연차관리 등록한다.
- *
- * @param indvdlYrycManage - 연차관리 model
- * @return String - 리턴 Url
- */
- @RequestMapping(value = "/uss/ion/yrc/EgovIndvdlYrycRegist.do", method = RequestMethod.POST)
- public String insertIndvdlYrycManage(@ModelAttribute IndvdlYrycManage indvdlYrycManage, BindingResult bindingResult, ModelMap model) throws Exception {
-
- beanValidator.validate(indvdlYrycManage, bindingResult); // validation 수행
-
- if (bindingResult.hasErrors()) {
- model.addAttribute("indvdlYrycManage", indvdlYrycManage);
- return "egovframework/com/uss/ion/yrc/EgovIndvdlYrycRegist";
- } else {
- LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
- indvdlYrycManage.setMberId((user == null || user.getUniqId() == null) ? "" : user.getUniqId());
- indvdlYrycManage.setRemndrYrycCo(indvdlYrycManage.getOccrncYrycCo() - indvdlYrycManage.getUseYrycCo());
-
- int totCnt = egovIndvdlYrycManageService.selectIndvdlYrycManageListTotCnt(indvdlYrycManage);
-
- if (totCnt >= 1) {
- egovIndvdlYrycManageService.updtIndvdlYrycManage(indvdlYrycManage);
- } else {
- egovIndvdlYrycManageService.insertIndvdlYrycManage(indvdlYrycManage);
- }
-
- List resultList = egovIndvdlYrycManageService.selectIndvdlYrycManageList(indvdlYrycManage);
- model.addAttribute("resultList", resultList);
- model.addAttribute("totCnt", totCnt);
-
- return "egovframework/com/uss/ion/yrc/EgovIndvdlYrycManageList";
- }
- }
+ /**
+ * 개인연차관리정보를 관리하기 위해 등록된 개인연차관리 목록을 조회한다.
+ *
+ * @param IndvdlYrycManage - 개인연차관리 VO
+ * @return String - 리턴 Url
+ */
+ @IncludedInfo(name = "개인연차관리", order = 902, gid = 50)
+ @RequestMapping(value = "/uss/ion/yrc/EgovIndvdlYrycManageList.do")
+ public String selectIndvdlYrycManageList(IndvdlYrycManage indvdlYrycManage, ModelMap model) throws Exception {
+
+ LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+ if (user == null) {
+ return "redirect:/uat/uia/egovLoginUsr.do";
+ }
+
+ indvdlYrycManage.setMberId(user.getUniqId());
+
+ List resultList = egovIndvdlYrycManageService.selectIndvdlYrycManageList(indvdlYrycManage);
+ model.addAttribute("resultList", resultList);
+
+ return "egovframework/com/uss/ion/yrc/EgovIndvdlYrycManageList";
+ }
+
+ /**
+ * 개인별연차관리 등록 화면으로 이동한다.
+ *
+ * @param indvdlYrycManage - 연차관리 model
+ * @return String - 리턴 Url
+ */
+ @RequestMapping(value = "/uss/ion/yrc/EgovIndvdlYrycRegist.do", method = RequestMethod.GET)
+ public String insertViewIndvdlYrycManage(@ModelAttribute IndvdlYrycManage indvdlYrycManage, ModelMap model) throws Exception {
+
+ LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+ indvdlYrycManage.setMberId(user == null ? "" : EgovStringUtil.isNullToString(user.getUniqId()));
+ indvdlYrycManage.setMberNm(user == null ? "" : EgovStringUtil.isNullToString(user.getName()));
+
+ List resultList = egovIndvdlYrycManageService.selectIndvdlYrycManageList(indvdlYrycManage);
+ indvdlYrycManage.setOccrrncYear(EgovDateUtil.getCurrentYearAsString());
+
+ int totCnt = egovIndvdlYrycManageService.selectIndvdlYrycManageListTotCnt(indvdlYrycManage);
+
+ model.addAttribute("resultList", resultList);
+ model.addAttribute("totCnt", totCnt);
+
+ return "egovframework/com/uss/ion/yrc/EgovIndvdlYrycRegist";
+ }
+
+ /**
+ * 개인별연차관리 등록한다.
+ *
+ * @param indvdlYrycManage - 연차관리 model
+ * @return String - 리턴 Url
+ */
+ @RequestMapping(value = "/uss/ion/yrc/EgovIndvdlYrycRegist.do", method = RequestMethod.POST)
+ public String insertIndvdlYrycManage(@ModelAttribute IndvdlYrycManage indvdlYrycManage, BindingResult bindingResult, ModelMap model) throws Exception {
+
+ beanValidator.validate(indvdlYrycManage, bindingResult); // validation 수행
+
+ if (bindingResult.hasErrors()) {
+ model.addAttribute("indvdlYrycManage", indvdlYrycManage);
+ return "egovframework/com/uss/ion/yrc/EgovIndvdlYrycRegist";
+ } else {
+ LoginVO user = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+ indvdlYrycManage.setMberId((user == null || user.getUniqId() == null) ? "" : user.getUniqId());
+ indvdlYrycManage.setRemndrYrycCo(indvdlYrycManage.getOccrncYrycCo() - indvdlYrycManage.getUseYrycCo());
+
+ int totCnt = egovIndvdlYrycManageService.selectIndvdlYrycManageListTotCnt(indvdlYrycManage);
+
+ if (totCnt >= 1) {
+ egovIndvdlYrycManageService.updtIndvdlYrycManage(indvdlYrycManage);
+ } else {
+ egovIndvdlYrycManageService.insertIndvdlYrycManage(indvdlYrycManage);
+ }
+
+ List resultList = egovIndvdlYrycManageService.selectIndvdlYrycManageList(indvdlYrycManage);
+ model.addAttribute("resultList", resultList);
+ model.addAttribute("totCnt", totCnt);
+
+ return "egovframework/com/uss/ion/yrc/EgovIndvdlYrycManageList";
+ }
+ }
/**
* 개인별연차관리 삭제한다.
diff --git a/src/main/java/egovframework/com/uss/olh/omm/web/EgovOnlineManualController.java b/src/main/java/egovframework/com/uss/olh/omm/web/EgovOnlineManualController.java
index d29f244e5..70d1ed8a9 100644
--- a/src/main/java/egovframework/com/uss/olh/omm/web/EgovOnlineManualController.java
+++ b/src/main/java/egovframework/com/uss/olh/omm/web/EgovOnlineManualController.java
@@ -17,8 +17,6 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springmodules.validation.commons.DefaultBeanValidator;
-import com.github.javaparser.utils.Log;
-
import egovframework.com.cmm.ComDefaultCodeVO;
import egovframework.com.cmm.EgovMessageSource;
import egovframework.com.cmm.LoginVO;
@@ -98,8 +96,8 @@ public String selectOnlineManualUserList(@ModelAttribute("searchVO") OnlineManua
searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
- List reusltList = egovOnlineManualService.selectOnlineManualList(searchVO);
- model.addAttribute("resultList", reusltList);
+ List resultList = egovOnlineManualService.selectOnlineManualList(searchVO);
+ model.addAttribute("resultList", resultList);
int totCnt = egovOnlineManualService.selectOnlineManualListCnt(searchVO);
paginationInfo.setTotalRecordCount(totCnt);
@@ -153,8 +151,8 @@ public String selectOnlineManualList(@ModelAttribute("searchVO") OnlineManualVO
searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
- List reusltList = egovOnlineManualService.selectOnlineManualList(searchVO);
- model.addAttribute("resultList", reusltList);
+ List resultList = egovOnlineManualService.selectOnlineManualList(searchVO);
+ model.addAttribute("resultList", resultList);
int totCnt = egovOnlineManualService.selectOnlineManualListCnt(searchVO);
paginationInfo.setTotalRecordCount(totCnt);
diff --git a/src/main/java/egovframework/com/uss/olp/cns/service/impl/CnsltManageDAO.java b/src/main/java/egovframework/com/uss/olp/cns/service/impl/CnsltManageDAO.java
index 7774cd9c1..b9cbb6d3f 100644
--- a/src/main/java/egovframework/com/uss/olp/cns/service/impl/CnsltManageDAO.java
+++ b/src/main/java/egovframework/com/uss/olp/cns/service/impl/CnsltManageDAO.java
@@ -63,7 +63,7 @@ public void updateCnsltInqireCo(CnsltManageVO vo) throws Exception {
*/
public List selectCnsltList(CnsltManageDefaultVO searchVO) throws Exception {
- return selectList("CnsltManageDAO.selectCnsltList", searchVO);
+ return selectList("CnsltManageDAO.selectCnsltList", searchVO);
}
@@ -144,7 +144,7 @@ public CnsltManageVO selectCnsltAnswerListDetail(CnsltManageVO vo) throws Except
*/
public List selectCnsltAnswerList(CnsltManageDefaultVO searchVO) throws Exception {
- return selectList("CnsltManageDAO.selectCnsltAnswerList", searchVO);
+ return selectList("CnsltManageDAO.selectCnsltAnswerList", searchVO);
}
diff --git a/src/main/java/egovframework/com/uss/olp/cns/web/EgovCnsltManageController.java b/src/main/java/egovframework/com/uss/olp/cns/web/EgovCnsltManageController.java
index e79361b80..0f6efe654 100644
--- a/src/main/java/egovframework/com/uss/olp/cns/web/EgovCnsltManageController.java
+++ b/src/main/java/egovframework/com/uss/olp/cns/web/EgovCnsltManageController.java
@@ -42,575 +42,611 @@
/**
*
* 상담내용을 처리하는 컨트롤러 클래스
+ *
* @author 공통서비스 개발팀 박정규
* @since 2009.04.01
* @version 1.0
* @see
*
- *
+ *
* << 개정이력(Modification Information) >>
*
- * 수정일 수정자 수정내용
- * ----------- -------- ---------------------------
- * 2009.04.01 박정규 최초 생성
- * 2011.08.26 정진오 IncludedInfo annotation 추가
+ * 수정일 수정자 수정내용
+ * ------- -------- ---------------------------
+ * 2009.04.01 박정규 최초 생성
+ * 2011.8.26 정진오 IncludedInfo annotation 추가
*
- *
+ *
*/
@Controller
public class EgovCnsltManageController {
- private static final Logger LOGGER = LoggerFactory.getLogger(EgovCnsltManageController.class);
-
- @Resource(name = "CnsltManageService")
- private EgovCnsltManageService cnsltManageService;
-
- /** EgovPropertyService */
- @Resource(name = "propertiesService")
- protected EgovPropertyService propertiesService;
-
- @Resource(name = "EgovCmmUseService")
- private EgovCmmUseService cmmUseService;
-
- // 첨부파일 관련
- @Resource(name = "EgovFileMngService")
- private EgovFileMngService fileMngService;
-
- @Resource(name = "EgovFileMngUtil")
- private EgovFileMngUtil fileUtil;
-
- /** EgovMessageSource */
- @Resource(name = "egovMessageSource")
- EgovMessageSource egovMessageSource;
-
- // Validation 관련
- @Autowired
- private DefaultBeanValidator beanValidator;
-
- /**
- * 개별 배포시 메인메뉴를 조회한다.
- *
- * @param model
- * @return "/uss/sam/cpy/"
- * @throws Exception
- */
- @RequestMapping(value = "/uss/olp/cns/EgovMain.do")
- public String egovMain(ModelMap model) throws Exception {
- return "egovframework/com/uss/olp/cns/EgovMain";
- }
-
- /**
- * 메뉴를 조회한다.
- *
- * @param model
- * @return "/uss/sam/cpy/EgovLeft"
- * @throws Exception
- */
- @RequestMapping(value = "/uss/olp/cns/EgovLeft.do")
- public String egovLeft(ModelMap model) throws Exception {
- return "egovframework/com/uss/olp/cns/EgovLeft";
- }
-
- /**
- * 상담정보 목록을 조회한다. (pageing)
- *
- * @param searchVO
- * @param model
- * @return "/uss/olp/cns/EgovCnsltListInqire"
- * @throws Exception
- */
- @IncludedInfo(name = "상담관리", order = 580, gid = 50)
- @RequestMapping(value = "/uss/olp/cns/CnsltListInqire.do")
- public String selectCnsltList(@ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, ModelMap model) throws Exception {
-
- /** EgovPropertyService.SiteList */
- searchVO.setPageUnit(propertiesService.getInt("pageUnit"));
- searchVO.setPageSize(propertiesService.getInt("pageSize"));
-
- /** pageing */
- PaginationInfo paginationInfo = new PaginationInfo();
- paginationInfo.setCurrentPageNo(searchVO.getPageIndex());
- paginationInfo.setRecordCountPerPage(searchVO.getPageUnit());
- paginationInfo.setPageSize(searchVO.getPageSize());
-
- searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
- searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
- searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
-
- List resultList = cnsltManageService.selectCnsltList(searchVO);
- model.addAttribute("resultList", resultList);
-
- // 인증여부 체크
- Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated();
-
- // isAuthenticated = false;
-
- if (!isAuthenticated) {
- model.addAttribute("certificationAt", "N");
- } else {
- model.addAttribute("certificationAt", "Y");
- }
-
- int totCnt = cnsltManageService.selectCnsltListTotCnt(searchVO);
- paginationInfo.setTotalRecordCount(totCnt);
- model.addAttribute("paginationInfo", paginationInfo);
-
- return "egovframework/com/uss/olp/cns/EgovCnsltListInqire";
- }
-
- /**
- * 상담정보 목록에 대한 상세정보를 조회한다.
- *
- * @param passwordConfirmAt
- * @param cnsltManageVO
- * @param searchVO
- * @param model
- * @return "/uss/olp/cns/EgovCnsltDetailInqire"
- * @throws Exception
- */
- @SuppressWarnings("deprecation")
- @RequestMapping("/uss/olp/cns/CnsltDetailInqire.do")
- public String selectCnsltListDetail(@RequestParam("passwordConfirmAt") String passwordConfirmAt, CnsltManageVO cnsltManageVO, @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, ModelMap model) throws Exception {
-
- CnsltManageVO vo = cnsltManageService.selectCnsltListDetail(cnsltManageVO);
-
- vo.setPasswordConfirmAt(passwordConfirmAt); // 작성비밀번호 확인여부
-
- // 작성 비밀번호를 얻는다.
- String writngPassword = vo.getWritngPassword();
-
- // EgovFileScrty Util에 있는 암호화 모듈을 적용해서 복호화한다.
- vo.setWritngPassword(EgovFileScrty.decode(writngPassword));
-
- model.addAttribute("result", vo);
-
- return "egovframework/com/uss/olp/cns/EgovCnsltDetailInqire";
- }
-
- /**
- * Q&A 조회수를 수정처리 한다.
- * @param cnsltManageVO
- * @param searchVO
- * @return "forward:/uss/olp/cns/CnsltDetailInqire.do"
- * @throws Exception
- */
- @RequestMapping("/uss/olp/cns/CnsltInqireCoUpdt.do")
- public String updateCnsltInqireCo(CnsltManageVO cnsltManageVO, @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO) throws Exception {
-
- cnsltManageService.updateCnsltInqireCo(cnsltManageVO);
-
- return "forward:/uss/olp/cns/CnsltDetailInqire.do";
- }
-
- /**
- * 로그인이나 실명확인 처리를 한다.
- *
- * @param cnsltManageVO
- * @param searchVO
- * @param model
- * @return /uss/olp/cns/EgovLoginRealnmChoice
- * @throws Exception
- */
- @RequestMapping("/uss/olp/cns/LoginRealnmChoice.do")
- public String selectLoginRealnmChoice(CnsltManageVO cnsltManageVO, @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, Model model) throws Exception {
-
- model.addAttribute("CnsltManageVO", new CnsltManageVO());
-
- return "egovframework/com/uss/olp/cns/EgovCnsltLoginRealnmChoice";
- }
-
- /**
- * 상담정보를 등록하기 위한 전 처리(인증체크)
- *
- * @param searchVO
- * @param cnsltManageVO
- * @param model
- * @return "/uss/olp/cns/EgovCnsltDtlsRegist"
- * @throws Exception
- */
- @RequestMapping("/uss/olp/cns/CnsltDtlsRegistView.do")
- public String insertCnsltDtlsView(@ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, CnsltManageVO cnsltManageVO, Model model) throws Exception {
-
- // 인증여부 체크
- Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated();
-
- // isAuthenticated = false;
- if (!isAuthenticated) {
- model.addAttribute("result", cnsltManageVO);
- return "egovframework/com/uss/olp/cns/EgovCnsltDtlsRegist";
- }
-
- // 로그인VO에서 사용자 정보 가져오기
- LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
-
- String wrterNm = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getName()); // 사용자명
- String emailAdres = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getEmail()); // email 주소
-
- cnsltManageVO.setWrterNm(wrterNm); // 작성자명
- cnsltManageVO.setEmailAdres(emailAdres); // email 주소
-
- model.addAttribute("result", cnsltManageVO);
-
- return "egovframework/com/uss/olp/cns/EgovCnsltDtlsRegist";
- }
-
- /**
- * 상담정보를 등록한다.
- *
- * @param multiRequest
- * @param searchVO
- * @param cnsltManageVO
- * @param bindingResult
- * @param model
- * @return "forward:/uss/olp/cns/CnsltListInqire.do"
- * @throws Exception
- */
- @SuppressWarnings("deprecation")
- @RequestMapping("/uss/olp/cns/CnsltDtlsRegist.do")
- public String insertCnsltDtls(final MultipartHttpServletRequest multiRequest, // 첨부파일을 위한...
- @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, @ModelAttribute("cnsltManageVO") CnsltManageVO cnsltManageVO, BindingResult bindingResult, ModelMap model) throws Exception {
+ private static final Logger LOGGER = LoggerFactory.getLogger(EgovCnsltManageController.class);
+
+ @Resource(name = "CnsltManageService")
+ private EgovCnsltManageService cnsltManageService;
+
+ /** EgovPropertyService */
+ @Resource(name = "propertiesService")
+ protected EgovPropertyService propertiesService;
+
+ @Resource(name = "EgovCmmUseService")
+ private EgovCmmUseService cmmUseService;
+
+ // 첨부파일 관련
+ @Resource(name = "EgovFileMngService")
+ private EgovFileMngService fileMngService;
+
+ @Resource(name = "EgovFileMngUtil")
+ private EgovFileMngUtil fileUtil;
+
+ /** EgovMessageSource */
+ @Resource(name = "egovMessageSource")
+ EgovMessageSource egovMessageSource;
+
+ // Validation 관련
+ @Autowired
+ private DefaultBeanValidator beanValidator;
+
+ /**
+ * 개별 배포시 메인메뉴를 조회한다.
+ *
+ * @param model
+ * @return "/uss/sam/cpy/"
+ * @throws Exception
+ */
+ @RequestMapping(value = "/uss/olp/cns/EgovMain.do")
+ public String egovMain(ModelMap model) throws Exception {
+ return "egovframework/com/uss/olp/cns/EgovMain";
+ }
+
+ /**
+ * 메뉴를 조회한다.
+ *
+ * @param model
+ * @return "/uss/sam/cpy/EgovLeft"
+ * @throws Exception
+ */
+ @RequestMapping(value = "/uss/olp/cns/EgovLeft.do")
+ public String egovLeft(ModelMap model) throws Exception {
+ return "egovframework/com/uss/olp/cns/EgovLeft";
+ }
+
+ /**
+ * 상담정보 목록을 조회한다. (pageing)
+ *
+ * @param searchVO
+ * @param model
+ * @return "/uss/olp/cns/EgovCnsltListInqire"
+ * @throws Exception
+ */
+ @IncludedInfo(name = "상담관리", order = 580, gid = 50)
+ @RequestMapping(value = "/uss/olp/cns/CnsltListInqire.do")
+ public String selectCnsltList(@ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, ModelMap model)
+ throws Exception {
+
+ /** EgovPropertyService.SiteList */
+ searchVO.setPageUnit(propertiesService.getInt("pageUnit"));
+ searchVO.setPageSize(propertiesService.getInt("pageSize"));
+
+ /** pageing */
+ PaginationInfo paginationInfo = new PaginationInfo();
+ paginationInfo.setCurrentPageNo(searchVO.getPageIndex());
+ paginationInfo.setRecordCountPerPage(searchVO.getPageUnit());
+ paginationInfo.setPageSize(searchVO.getPageSize());
+
+ searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+ searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
+ searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+
+ List resultList = cnsltManageService.selectCnsltList(searchVO);
+ model.addAttribute("resultList", resultList);
+
+ // 인증여부 체크
+ Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated();
+
+ // isAuthenticated = false;
+
+ if (!isAuthenticated) {
+
+ model.addAttribute("certificationAt", "N");
+
+ } else {
+
+ model.addAttribute("certificationAt", "Y");
+
+ }
+
+ int totCnt = cnsltManageService.selectCnsltListTotCnt(searchVO);
+ paginationInfo.setTotalRecordCount(totCnt);
+ model.addAttribute("paginationInfo", paginationInfo);
+
+ return "egovframework/com/uss/olp/cns/EgovCnsltListInqire";
+ }
+
+ /**
+ * 상담정보 목록에 대한 상세정보를 조회한다.
+ *
+ * @param passwordConfirmAt
+ * @param cnsltManageVO
+ * @param searchVO
+ * @param model
+ * @return "/uss/olp/cns/EgovCnsltDetailInqire"
+ * @throws Exception
+ */
+ @SuppressWarnings("deprecation")
+ @RequestMapping("/uss/olp/cns/CnsltDetailInqire.do")
+ public String selectCnsltListDetail(@RequestParam("passwordConfirmAt") String passwordConfirmAt,
+ CnsltManageVO cnsltManageVO, @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, ModelMap model)
+ throws Exception {
+
+ CnsltManageVO vo = cnsltManageService.selectCnsltListDetail(cnsltManageVO);
+
+ vo.setPasswordConfirmAt(passwordConfirmAt); // 작성비밀번호 확인여부
+
+ // 작성 비밀번호를 얻는다.
+ String writngPassword = vo.getWritngPassword();
+
+ // EgovFileScrty Util에 있는 암호화 모듈을 적용해서 복호화한다.
+ vo.setWritngPassword(EgovFileScrty.decode(writngPassword));
+
+ model.addAttribute("result", vo);
+
+ return "egovframework/com/uss/olp/cns/EgovCnsltDetailInqire";
+ }
+
+ /**
+ * Q&A 조회수를 수정처리 한다.
+ *
+ * @param cnsltManageVO
+ * @param searchVO
+ * @return "forward:/uss/olp/cns/CnsltDetailInqire.do"
+ * @throws Exception
+ */
+ @RequestMapping("/uss/olp/cns/CnsltInqireCoUpdt.do")
+ public String updateCnsltInqireCo(CnsltManageVO cnsltManageVO,
+ @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO) throws Exception {
+
+ cnsltManageService.updateCnsltInqireCo(cnsltManageVO);
+
+ return "forward:/uss/olp/cns/CnsltDetailInqire.do";
+
+ }
+
+ /**
+ * 로그인이나 실명확인 처리를 한다.
+ *
+ * @param cnsltManageVO
+ * @param searchVO
+ * @param model
+ * @return /uss/olp/cns/EgovLoginRealnmChoice
+ * @throws Exception
+ */
+ @RequestMapping("/uss/olp/cns/LoginRealnmChoice.do")
+ public String selectLoginRealnmChoice(CnsltManageVO cnsltManageVO,
+ @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, Model model) throws Exception {
- beanValidator.validate(cnsltManageVO, bindingResult);
+ model.addAttribute("CnsltManageVO", new CnsltManageVO());
- if (bindingResult.hasErrors()) {
- return "egovframework/com/uss/olp/cns/EgovCnsltDtlsRegist";
- }
-
- // 첨부파일 관련 첨부파일ID 생성
- List _result = null;
- String _atchFileId = "";
-
- // final Map files = multiRequest.getFileMap();
- final List files = multiRequest.getFiles("file_1");
-
- if (!files.isEmpty()) {
- _result = fileUtil.parseFileInf(files, "CNSLT_", 0, "", "");
- _atchFileId = fileMngService.insertFileInfs(_result); // 파일이 생성되고나면 생성된 첨부파일 ID를 리턴한다.
- }
-
- // 리턴받은 첨부파일ID를 셋팅한다..
- cnsltManageVO.setAtchFileId(_atchFileId); // 첨부파일 ID
-
- // 로그인VO에서 사용자 정보 가져오기
- LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
-
- String frstRegisterId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
-
- cnsltManageVO.setFrstRegisterId(frstRegisterId); // 최초등록자ID
- cnsltManageVO.setLastUpdusrId(frstRegisterId); // 최종수정자ID
-
- // 작성비밀번호를 암호화 하기 위해서 Get
- String writngPassword = EgovStringUtil.isNullToString(cnsltManageVO.getWritngPassword());// KISA 보안약점 조치 (2018-10-29, 윤창원)
-
- // EgovFileScrty Util에 있는 암호화 모듈을 적용해서 암호화 한다.
- cnsltManageVO.setWritngPassword(EgovFileScrty.encode(writngPassword));
-
- cnsltManageService.insertCnsltDtls(cnsltManageVO);
-
- return "forward:/uss/olp/cns/CnsltListInqire.do";
- }
-
- /**
- * 작성 비밀번호를 확인하기 위한 전 처리
- *
- * @param cnsltManageVO
- * @param searchVO
- * @param model
- * @return "/uss/olp/cns/EgovCnsltPasswordConfirm"
- * @throws Exception
- */
- @RequestMapping("/uss/olp/cns/CnsltPasswordConfirmView.do")
- public String selectPasswordConfirmView(CnsltManageVO cnsltManageVO, @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, Model model) throws Exception {
-
- model.addAttribute("CnsltManageVO", new CnsltManageVO());
-
- return "egovframework/com/uss/olp/cns/EgovCnsltPasswordConfirm";
- }
+ return "egovframework/com/uss/olp/cns/EgovCnsltLoginRealnmChoice";
+ }
- /**
- * 작성 비밀번호를 확인한다.
- *
- * @param cnsltManageVO
- * @param searchVO
- * @param model
- * @return "forward:/uss/olp/cns/CnsltDetailInqire.do"
- * @throws Exception
- */
- @SuppressWarnings("deprecation")
- @RequestMapping("/uss/olp/cns/CnsltPasswordConfirm.do")
- public String selectPasswordConfirm(CnsltManageVO cnsltManageVO, @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, Model model) throws Exception {
+ /**
+ * 상담정보를 등록하기 위한 전 처리(인증체크)
+ *
+ * @param searchVO
+ * @param cnsltManageVO
+ * @param model
+ * @return "/uss/olp/cns/EgovCnsltDtlsRegist"
+ * @throws Exception
+ */
+ @RequestMapping("/uss/olp/cns/CnsltDtlsRegistView.do")
+ public String insertCnsltDtlsView(@ModelAttribute("searchVO") CnsltManageDefaultVO searchVO,
+ CnsltManageVO cnsltManageVO, Model model) throws Exception {
- // 작성비밀번호를 암호화 하기 위해서 Get
- String writngPassword = EgovStringUtil.isNullToString(cnsltManageVO.getWritngPassword());// KISA 보안약점 조치 (2018-10-29, 윤창원)
+ // 인증여부 체크
+ Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated();
- // EgovFileScrty Util에 있는 암호화 모듈을 적용해서 암호화 한다.
- cnsltManageVO.setWritngPassword(EgovFileScrty.encode(writngPassword));
+ // isAuthenticated = false;
- int searchCnt = cnsltManageService.selectCnsltPasswordConfirmCnt(cnsltManageVO);
+ if (!isAuthenticated) {
- if (searchCnt > 0) { // 작성 비밀번호가 일치하는 경우
-
- // 상담정보를 수정할 수 있는 화면으로 이동.
- return "forward:/uss/olp/cns/CnsltDtlsUpdtView.do";
+ model.addAttribute("result", cnsltManageVO);
- } else { // 작성비밀번호가 틀린경우
+ return "egovframework/com/uss/olp/cns/EgovCnsltDtlsRegist";
+
+ }
+
+ // 로그인VO에서 사용자 정보 가져오기
+ LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+
+ String wrterNm = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getName()); // 사용자명
+ String emailAdres = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getEmail()); // email 주소
+
+ cnsltManageVO.setWrterNm(wrterNm); // 작성자명
+ cnsltManageVO.setEmailAdres(emailAdres); // email 주소
+
+ model.addAttribute("result", cnsltManageVO);
+
+ return "egovframework/com/uss/olp/cns/EgovCnsltDtlsRegist";
+ }
+
+ /**
+ * 상담정보를 등록한다.
+ *
+ * @param multiRequest
+ * @param searchVO
+ * @param cnsltManageVO
+ * @param bindingResult
+ * @param model
+ * @return "forward:/uss/olp/cns/CnsltListInqire.do"
+ * @throws Exception
+ */
+ @SuppressWarnings("deprecation")
+ @RequestMapping("/uss/olp/cns/CnsltDtlsRegist.do")
+ public String insertCnsltDtls(final MultipartHttpServletRequest multiRequest, // 첨부파일을 위한...
+ @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO,
+ @ModelAttribute("cnsltManageVO") CnsltManageVO cnsltManageVO, BindingResult bindingResult, ModelMap model)
+ throws Exception {
- // 작성비밀번호 확인 결과 세팅.
- // cnsltManageVO.setPasswordConfirmAt("N");
+ beanValidator.validate(cnsltManageVO, bindingResult);
- String passwordConfirmAt = "N";
+ if (bindingResult.hasErrors()) {
- // Q&A 상세조회 화면으로 이동.
- return "forward:/uss/olp/cns/CnsltDetailInqire.do?passwordConfirmAt=" + passwordConfirmAt;
+ return "egovframework/com/uss/olp/cns/EgovCnsltDtlsRegist";
- }
+ }
- }
+ // 첨부파일 관련 첨부파일ID 생성
+ List _result = null;
+ String _atchFileId = "";
- /**
- * 상담정보를 수정하기 위한 전 처리(비밀번호 복호화)
- *
- * @param cnsltManageVO
- * @param searchVO
- * @param model
- * @return "/uss/olp/cns/EgovCnsltDtlsUpdt"
- * @throws Exception
- */
- @SuppressWarnings("deprecation")
- @RequestMapping("/uss/olp/cns/CnsltDtlsUpdtView.do")
- public String updateCnsltDtlsView(CnsltManageVO cnsltManageVO, @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, ModelMap model) throws Exception {
+ // final Map files = multiRequest.getFileMap();
+ final List files = multiRequest.getFiles("file_1");
- CnsltManageVO vo = cnsltManageService.selectCnsltListDetail(cnsltManageVO);
+ if (!files.isEmpty()) {
+ _result = fileUtil.parseFileInf(files, "CNSLT_", 0, "", "");
+ _atchFileId = fileMngService.insertFileInfs(_result); // 파일이 생성되고나면 생성된 첨부파일 ID를 리턴한다.
+ }
- // 작성 비밀번호를 얻는다.
- String writngPassword = vo.getWritngPassword();
+ // 리턴받은 첨부파일ID를 셋팅한다..
+ cnsltManageVO.setAtchFileId(_atchFileId); // 첨부파일 ID
- // EgovFileScrty Util에 있는 암호화 모듈을 적용해서 복호화한다.
- vo.setWritngPassword(EgovFileScrty.decode(writngPassword));
+ // 로그인VO에서 사용자 정보 가져오기
+ LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
- // 복호화된 패스워드를 넘긴다..
- model.addAttribute("cnsltManageVO", vo);
+ String frstRegisterId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
- // result에도 세팅(jstl 사용을 위해)
- model.addAttribute(selectCnsltListDetail("Y", cnsltManageVO, searchVO, model));
+ cnsltManageVO.setFrstRegisterId(frstRegisterId); // 최초등록자ID
+ cnsltManageVO.setLastUpdusrId(frstRegisterId); // 최종수정자ID
- return "egovframework/com/uss/olp/cns/EgovCnsltDtlsUpdt";
- }
+ // 작성비밀번호를 암호화 하기 위해서 Get
+ String writngPassword = EgovStringUtil.isNullToString(cnsltManageVO.getWritngPassword());// KISA 보안약점 조치
+ // (2018-10-29, 윤창원)
- /**
- * 상담정보를 수정처리한다.
- *
- * @param atchFileAt
- * @param multiRequest
- * @param searchVO
- * @param cnsltManageVO
- * @param bindingResult
- * @param model
- * @return "forward:/uss/olp/cns/CnsltListInqire.do"
- * @throws Exception
- */
- @SuppressWarnings("deprecation")
- @RequestMapping("/uss/olp/cns/CnsltDtlsUpdt.do")
- public String updateCnsltDtls(@RequestParam("atchFileAt") String atchFileAt, final MultipartHttpServletRequest multiRequest, @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO,
- @ModelAttribute("cnsltManageVO") CnsltManageVO cnsltManageVO, BindingResult bindingResult, ModelMap model) throws Exception {
+ // EgovFileScrty Util에 있는 암호화 모듈을 적용해서 암호화 한다.
+ cnsltManageVO.setWritngPassword(EgovFileScrty.encode(writngPassword));
- // Validation
- beanValidator.validate(cnsltManageVO, bindingResult);
+ cnsltManageService.insertCnsltDtls(cnsltManageVO);
- if (bindingResult.hasErrors()) {
+ return "forward:/uss/olp/cns/CnsltListInqire.do";
+ }
- return "egovframework/com/uss/olp/cns/EgovCnsltDtlsUpdt";
+ /**
+ * 작성 비밀번호를 확인하기 위한 전 처리
+ *
+ * @param cnsltManageVO
+ * @param searchVO
+ * @param model
+ * @return "/uss/olp/cns/EgovCnsltPasswordConfirm"
+ * @throws Exception
+ */
+ @RequestMapping("/uss/olp/cns/CnsltPasswordConfirmView.do")
+ public String selectPasswordConfirmView(CnsltManageVO cnsltManageVO,
+ @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, Model model) throws Exception {
- }
+ model.addAttribute("CnsltManageVO", new CnsltManageVO());
- // 첨부파일 관련 ID 생성 start....
- String _atchFileId = cnsltManageVO.getAtchFileId();
+ return "egovframework/com/uss/olp/cns/EgovCnsltPasswordConfirm";
+ }
- // final Map files = multiRequest.getFileMap();
- final List files = multiRequest.getFiles("file_1");
-
- if (!files.isEmpty()) {
-
- if ("N".equals(atchFileAt)) {
- List _result = fileUtil.parseFileInf(files, "CNSLT_", 0, _atchFileId, "");
- _atchFileId = fileMngService.insertFileInfs(_result);
+ /**
+ * 작성 비밀번호를 확인한다.
+ *
+ * @param cnsltManageVO
+ * @param searchVO
+ * @param model
+ * @return "forward:/uss/olp/cns/CnsltDetailInqire.do"
+ * @throws Exception
+ */
+ @SuppressWarnings("deprecation")
+ @RequestMapping("/uss/olp/cns/CnsltPasswordConfirm.do")
+ public String selectPasswordConfirm(CnsltManageVO cnsltManageVO,
+ @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, Model model) throws Exception {
- // 첨부파일 ID 셋팅
- cnsltManageVO.setAtchFileId(_atchFileId); // 첨부파일 ID
+ // 작성비밀번호를 암호화 하기 위해서 Get
+ String writngPassword = EgovStringUtil.isNullToString(cnsltManageVO.getWritngPassword());// KISA 보안약점 조치
+ // (2018-10-29, 윤창원)
- } else {
- FileVO fvo = new FileVO();
- fvo.setAtchFileId(_atchFileId);
- int _cnt = fileMngService.getMaxFileSN(fvo);
- List _result = fileUtil.parseFileInf(files, "CNSLT_", _cnt, _atchFileId, "");
- fileMngService.updateFileInfs(_result);
- }
- }
- // 첨부파일 관련 ID 생성 end...
+ // EgovFileScrty Util에 있는 암호화 모듈을 적용해서 암호화 한다.
+ cnsltManageVO.setWritngPassword(EgovFileScrty.encode(writngPassword));
+
+ int searchCnt = cnsltManageService.selectCnsltPasswordConfirmCnt(cnsltManageVO);
+
+ if (searchCnt > 0) { // 작성 비밀번호가 일치하는 경우
+
+ // 상담정보를 수정할 수 있는 화면으로 이동.
+ return "forward:/uss/olp/cns/CnsltDtlsUpdtView.do";
+
+ } else { // 작성비밀번호가 틀린경우
+
+ // 작성비밀번호 확인 결과 세팅.
+ // cnsltManageVO.setPasswordConfirmAt("N");
+
+ String passwordConfirmAt = "N";
+
+ // Q&A 상세조회 화면으로 이동.
+ return "forward:/uss/olp/cns/CnsltDetailInqire.do?passwordConfirmAt=" + passwordConfirmAt;
+
+ }
+
+ }
+
+ /**
+ * 상담정보를 수정하기 위한 전 처리(비밀번호 복호화)
+ *
+ * @param cnsltManageVO
+ * @param searchVO
+ * @param model
+ * @return "/uss/olp/cns/EgovCnsltDtlsUpdt"
+ * @throws Exception
+ */
+ @SuppressWarnings("deprecation")
+ @RequestMapping("/uss/olp/cns/CnsltDtlsUpdtView.do")
+ public String updateCnsltDtlsView(CnsltManageVO cnsltManageVO,
+ @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, ModelMap model) throws Exception {
+
+ CnsltManageVO vo = cnsltManageService.selectCnsltListDetail(cnsltManageVO);
+
+ // 작성 비밀번호를 얻는다.
+ String writngPassword = vo.getWritngPassword();
+
+ // EgovFileScrty Util에 있는 암호화 모듈을 적용해서 복호화한다.
+ vo.setWritngPassword(EgovFileScrty.decode(writngPassword));
+
+ // 복호화된 패스워드를 넘긴다..
+ model.addAttribute("cnsltManageVO", vo);
+
+ // result에도 세팅(jstl 사용을 위해)
+ model.addAttribute(selectCnsltListDetail("Y", cnsltManageVO, searchVO, model));
+
+ return "egovframework/com/uss/olp/cns/EgovCnsltDtlsUpdt";
+ }
+
+ /**
+ * 상담정보를 수정처리한다.
+ *
+ * @param atchFileAt
+ * @param multiRequest
+ * @param searchVO
+ * @param cnsltManageVO
+ * @param bindingResult
+ * @param model
+ * @return "forward:/uss/olp/cns/CnsltListInqire.do"
+ * @throws Exception
+ */
+ @SuppressWarnings("deprecation")
+ @RequestMapping("/uss/olp/cns/CnsltDtlsUpdt.do")
+ public String updateCnsltDtls(@RequestParam("atchFileAt") String atchFileAt,
+ final MultipartHttpServletRequest multiRequest, @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO,
+ @ModelAttribute("cnsltManageVO") CnsltManageVO cnsltManageVO, BindingResult bindingResult, ModelMap model)
+ throws Exception {
+
+ // Validation
+ beanValidator.validate(cnsltManageVO, bindingResult);
+
+ if (bindingResult.hasErrors()) {
+
+ return "egovframework/com/uss/olp/cns/EgovCnsltDtlsUpdt";
+
+ }
+
+ // 첨부파일 관련 ID 생성 start....
+ String _atchFileId = cnsltManageVO.getAtchFileId();
+
+ // final Map files = multiRequest.getFileMap();
+ final List files = multiRequest.getFiles("file_1");
+
+ if (!files.isEmpty()) {
+
+ if ("N".equals(atchFileAt)) {
+ List _result = fileUtil.parseFileInf(files, "CNSLT_", 0, _atchFileId, "");
+ _atchFileId = fileMngService.insertFileInfs(_result);
+
+ // 첨부파일 ID 셋팅
+ cnsltManageVO.setAtchFileId(_atchFileId); // 첨부파일 ID
+
+ } else {
+ FileVO fvo = new FileVO();
+ fvo.setAtchFileId(_atchFileId);
+ int _cnt = fileMngService.getMaxFileSN(fvo);
+ List _result = fileUtil.parseFileInf(files, "CNSLT_", _cnt, _atchFileId, "");
+ fileMngService.updateFileInfs(_result);
+ }
+ }
+ // 첨부파일 관련 ID 생성 end...
+
+ // 로그인VO에서 사용자 정보 가져오기
+ LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+
+ String lastUpdusrId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
+
+ cnsltManageVO.setLastUpdusrId(lastUpdusrId); // 최종수정자ID
+
+ // 작성비밀번호를 암호화 하기 위해서 Get
+ String writngPassword = EgovStringUtil.isNullToString(cnsltManageVO.getWritngPassword());// KISA 보안약점 조치
+ // (2018-10-29, 윤창원)
+
+ // EgovFileScrty Util에 있는 암호화 모듈을 적용해서 암호화 한다.
+ cnsltManageVO.setWritngPassword(EgovFileScrty.encode(writngPassword));
+
+ cnsltManageService.updateCnsltDtls(cnsltManageVO);
+
+ return "forward:/uss/olp/cns/CnsltListInqire.do";
+
+ }
+
+ /**
+ * 상담정보를 삭제처리한다.
+ *
+ * @param cnsltManageVO
+ * @param searchVO
+ * @return "forward:/uss/olp/cns/CnsltListInqire.do"
+ * @throws Exception
+ */
+ @RequestMapping("/uss/olp/cns/CnsltDtlsDelete.do")
+ public String deleteCnsltDtls(HttpServletRequest request, CnsltManageVO cnsltManageVO,
+ @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO) throws Exception {
+
+ // --------------------------------------------------------------------------------------------
+ // @ XSS 사용자권한체크 START
+ // param1 : 사용자고유ID(uniqId,esntlId)
+ // --------------------------------------------------------
+ LOGGER.debug("@ XSS 권한체크 START ----------------------------------------------");
+ ;
+
+ // step1 DB에서 해당 게시물의 uniqId 조회
+ CnsltManageVO vo = cnsltManageService.selectCnsltListDetail(cnsltManageVO);
+
+ // step2 EgovXssChecker 공통모듈을 이용한 권한체크
+ EgovXssChecker.checkerUserXss(request, vo.getFrstRegisterId());
+ LOGGER.debug("@ XSS 권한체크 END ------------------------------------------------");
+ // --------------------------------------------------------
+ // @ XSS 사용자권한체크 END
+ // --------------------------------------------------------------------------------------------
+
+ // 첨부파일 삭제를 위한 ID 생성 start....
+ String _atchFileId = cnsltManageVO.getAtchFileId();
+
+ cnsltManageService.deleteCnsltDtls(cnsltManageVO);
+
+ // 첨부파일을 삭제하기 위한 Vo
+ FileVO fvo = new FileVO();
+ fvo.setAtchFileId(_atchFileId);
+
+ fileMngService.deleteAllFileInf(fvo);
+ // 첨부파일 삭제 End.............
+
+ return "forward:/uss/olp/cns/CnsltListInqire.do";
+ }
+
+ /**
+ * Q&A답변정보 목록을 조회한다. (pageing)
+ *
+ * @param searchVO
+ * @param model
+ * @return "/uss/olp/cns/EgovCnsltAnswerListInqire"
+ * @throws Exception
+ */
+ @IncludedInfo(name = "상담답변관리", order = 581, gid = 50)
+ @RequestMapping(value = "/uss/olp/cnm/CnsltAnswerListInqire.do")
+ public String selectCnsltAnswerList(@ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, ModelMap model)
+ throws Exception {
+
+ /** EgovPropertyService.SiteList */
+ searchVO.setPageUnit(propertiesService.getInt("pageUnit"));
+ searchVO.setPageSize(propertiesService.getInt("pageSize"));
+
+ /** pageing */
+ PaginationInfo paginationInfo = new PaginationInfo();
+ paginationInfo.setCurrentPageNo(searchVO.getPageIndex());
+ paginationInfo.setRecordCountPerPage(searchVO.getPageUnit());
+ paginationInfo.setPageSize(searchVO.getPageSize());
+
+ searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+ searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
+ searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+
+ List CnsltAnswerList = cnsltManageService.selectCnsltAnswerList(searchVO);
+ model.addAttribute("resultList", CnsltAnswerList);
+
+ int totCnt = cnsltManageService.selectCnsltAnswerListTotCnt(searchVO);
+ paginationInfo.setTotalRecordCount(totCnt);
+ model.addAttribute("paginationInfo", paginationInfo);
+
+ return "egovframework/com/uss/olp/cns/EgovCnsltAnswerListInqire";
+ }
+
+ /**
+ * Q&A답변정보 목록에 대한 상세정보를 조회한다.
+ *
+ * @param cnsltManageVO
+ * @param searchVO
+ * @param model
+ * @return "/uss/olp/cns/EgovCnsltAnswerDetailInqire"
+ * @throws Exception
+ */
+ @RequestMapping("/uss/olp/cnm/CnsltAnswerDetailInqire.do")
+ public String selectCnsltAnswerListDetail(CnsltManageVO cnsltManageVO,
+ @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, ModelMap model) throws Exception {
+
+ CnsltManageVO vo = cnsltManageService.selectCnsltListDetail(cnsltManageVO);
+
+ model.addAttribute("result", vo);
+
+ return "egovframework/com/uss/olp/cns/EgovCnsltAnswerDetailInqire";
+ }
+
+ /**
+ * Q&A답변정보를 수정하기 위한 전 처리(공통코드처리)
+ *
+ * @param cnsltManageVO
+ * @param searchVO
+ * @param model
+ * @return "/uss/olp/cns/EgovCnsltDtlsAnswerUpdt"
+ * @throws Exception
+ */
+ @RequestMapping("/uss/olp/cnm/CnsltDtlsAnswerUpdtView.do")
+ public String updateCnsltDtlsAnswerView(CnsltManageVO cnsltManageVO,
+ @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, ModelMap model) throws Exception {
+
+ // 공통코드를 가져오기 위한 Vo
+ ComDefaultCodeVO comDefaultCodeVO = new ComDefaultCodeVO();
+ comDefaultCodeVO.setCodeId("COM028");
+
+ List _result = cmmUseService.selectCmmCodeDetail(comDefaultCodeVO);
+ model.addAttribute("resultList", _result);
+
+ // 변수명은 CoC 에 따라
+ model.addAttribute(selectCnsltAnswerListDetail(cnsltManageVO, searchVO, model));
+
+ return "egovframework/com/uss/olp/cns/EgovCnsltDtlsAnswerUpdt";
+ }
+
+ /**
+ * Q&A답변정보를 수정처리한다.
+ *
+ * @param cnsltManageVO
+ * @param searchVO
+ * @return "forward:/uss/olp/cnm/CnsltAnswerListInqire.do"
+ * @throws Exception
+ */
+ @RequestMapping("/uss/olp/cnm/CnsltDtlsAnswerUpdt.do")
+ public String updateCnsltDtlsAnswer(CnsltManageVO cnsltManageVO,
+ @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO) throws Exception {
+
+ // 로그인VO에서 사용자 정보 가져오기
+ LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
+
+ String lastUpdusrId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
+
+ cnsltManageVO.setLastUpdusrId(lastUpdusrId); // 최종수정자ID
+
+ cnsltManageService.updateCnsltDtlsAnswer(cnsltManageVO);
+
+ return "forward:/uss/olp/cnm/CnsltAnswerListInqire.do";
+
+ }
- // 로그인VO에서 사용자 정보 가져오기
- LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
-
- String lastUpdusrId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
-
- cnsltManageVO.setLastUpdusrId(lastUpdusrId); // 최종수정자ID
-
- // 작성비밀번호를 암호화 하기 위해서 Get
- String writngPassword = EgovStringUtil.isNullToString(cnsltManageVO.getWritngPassword());// KISA 보안약점 조치 (2018-10-29, 윤창원)
-
- // EgovFileScrty Util에 있는 암호화 모듈을 적용해서 암호화 한다.
- cnsltManageVO.setWritngPassword(EgovFileScrty.encode(writngPassword));
-
- cnsltManageService.updateCnsltDtls(cnsltManageVO);
-
- return "forward:/uss/olp/cns/CnsltListInqire.do";
-
- }
-
- /**
- * 상담정보를 삭제처리한다.
- *
- * @param cnsltManageVO
- * @param searchVO
- * @return "forward:/uss/olp/cns/CnsltListInqire.do"
- * @throws Exception
- */
- @RequestMapping("/uss/olp/cns/CnsltDtlsDelete.do")
- public String deleteCnsltDtls(HttpServletRequest request, CnsltManageVO cnsltManageVO, @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO) throws Exception {
-
- // --------------------------------------------------------------------------------------------
- // @ XSS 사용자권한체크 START
- // param1 : 사용자고유ID(uniqId,esntlId)
- // --------------------------------------------------------
- LOGGER.debug("@ XSS 권한체크 START ----------------------------------------------");
- ;
-
- // step1 DB에서 해당 게시물의 uniqId 조회
- CnsltManageVO vo = cnsltManageService.selectCnsltListDetail(cnsltManageVO);
-
- // step2 EgovXssChecker 공통모듈을 이용한 권한체크
- EgovXssChecker.checkerUserXss(request, vo.getFrstRegisterId());
- LOGGER.debug("@ XSS 권한체크 END ------------------------------------------------");
- // --------------------------------------------------------
- // @ XSS 사용자권한체크 END
- // --------------------------------------------------------------------------------------------
-
- // 첨부파일 삭제를 위한 ID 생성 start....
- String _atchFileId = cnsltManageVO.getAtchFileId();
-
- cnsltManageService.deleteCnsltDtls(cnsltManageVO);
-
- // 첨부파일을 삭제하기 위한 Vo
- FileVO fvo = new FileVO();
- fvo.setAtchFileId(_atchFileId);
-
- fileMngService.deleteAllFileInf(fvo);
- // 첨부파일 삭제 End.............
-
- return "forward:/uss/olp/cns/CnsltListInqire.do";
- }
-
- /**
- * Q&A답변정보 목록을 조회한다. (pageing)
- *
- * @param searchVO
- * @param model
- * @return "/uss/olp/cns/EgovCnsltAnswerListInqire"
- * @throws Exception
- */
- @IncludedInfo(name = "상담답변관리", order = 581, gid = 50)
- @RequestMapping(value = "/uss/olp/cnm/CnsltAnswerListInqire.do")
- public String selectCnsltAnswerList(@ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, ModelMap model) throws Exception {
-
- /** EgovPropertyService.SiteList */
- searchVO.setPageUnit(propertiesService.getInt("pageUnit"));
- searchVO.setPageSize(propertiesService.getInt("pageSize"));
-
- /** pageing */
- PaginationInfo paginationInfo = new PaginationInfo();
- paginationInfo.setCurrentPageNo(searchVO.getPageIndex());
- paginationInfo.setRecordCountPerPage(searchVO.getPageUnit());
- paginationInfo.setPageSize(searchVO.getPageSize());
-
- searchVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
- searchVO.setLastIndex(paginationInfo.getLastRecordIndex());
- searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
-
- List CnsltAnswerList = cnsltManageService.selectCnsltAnswerList(searchVO);
- model.addAttribute("resultList", CnsltAnswerList);
-
- int totCnt = cnsltManageService.selectCnsltAnswerListTotCnt(searchVO);
- paginationInfo.setTotalRecordCount(totCnt);
- model.addAttribute("paginationInfo", paginationInfo);
-
- return "egovframework/com/uss/olp/cns/EgovCnsltAnswerListInqire";
- }
-
- /**
- * Q&A답변정보 목록에 대한 상세정보를 조회한다.
- *
- * @param cnsltManageVO
- * @param searchVO
- * @param model
- * @return "/uss/olp/cns/EgovCnsltAnswerDetailInqire"
- * @throws Exception
- */
- @RequestMapping("/uss/olp/cnm/CnsltAnswerDetailInqire.do")
- public String selectCnsltAnswerListDetail(CnsltManageVO cnsltManageVO, @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, ModelMap model) throws Exception {
-
- CnsltManageVO vo = cnsltManageService.selectCnsltListDetail(cnsltManageVO);
-
- model.addAttribute("result", vo);
-
- return "egovframework/com/uss/olp/cns/EgovCnsltAnswerDetailInqire";
- }
-
- /**
- * Q&A답변정보를 수정하기 위한 전 처리(공통코드처리)
- *
- * @param cnsltManageVO
- * @param searchVO
- * @param model
- * @return "/uss/olp/cns/EgovCnsltDtlsAnswerUpdt"
- * @throws Exception
- */
- @RequestMapping("/uss/olp/cnm/CnsltDtlsAnswerUpdtView.do")
- public String updateCnsltDtlsAnswerView(CnsltManageVO cnsltManageVO, @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO, ModelMap model) throws Exception {
-
- // 공통코드를 가져오기 위한 VO
- ComDefaultCodeVO comDefaultCodeVO = new ComDefaultCodeVO();
- comDefaultCodeVO.setCodeId("COM028");
-
- List _result = cmmUseService.selectCmmCodeDetail(comDefaultCodeVO);
- model.addAttribute("resultList", _result);
-
- // 변수명은 CoC 에 따라
- model.addAttribute(selectCnsltAnswerListDetail(cnsltManageVO, searchVO, model));
-
- return "egovframework/com/uss/olp/cns/EgovCnsltDtlsAnswerUpdt";
- }
-
- /**
- * Q&A답변정보를 수정처리한다.
- *
- * @param cnsltManageVO
- * @param searchVO
- * @return "forward:/uss/olp/cnm/CnsltAnswerListInqire.do"
- * @throws Exception
- */
- @RequestMapping("/uss/olp/cnm/CnsltDtlsAnswerUpdt.do")
- public String updateCnsltDtlsAnswer(CnsltManageVO cnsltManageVO, @ModelAttribute("searchVO") CnsltManageDefaultVO searchVO) throws Exception {
-
- // 로그인VO에서 사용자 정보 가져오기
- LoginVO loginVO = (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser();
-
- String lastUpdusrId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
-
- cnsltManageVO.setLastUpdusrId(lastUpdusrId); // 최종수정자ID
-
- cnsltManageService.updateCnsltDtlsAnswer(cnsltManageVO);
-
- return "forward:/uss/olp/cnm/CnsltAnswerListInqire.do";
- }
}
diff --git a/src/main/java/egovframework/com/uss/olp/mgt/service/impl/EgovMeetingManageServiceImpl.java b/src/main/java/egovframework/com/uss/olp/mgt/service/impl/EgovMeetingManageServiceImpl.java
index 09bacfb19..faf11b2b3 100644
--- a/src/main/java/egovframework/com/uss/olp/mgt/service/impl/EgovMeetingManageServiceImpl.java
+++ b/src/main/java/egovframework/com/uss/olp/mgt/service/impl/EgovMeetingManageServiceImpl.java
@@ -48,7 +48,7 @@ public class EgovMeetingManageServiceImpl extends EgovAbstractServiceImpl implem
*/
@Override
public List egovMeetingManageLisAuthorGroupPopup(ComDefaultVO searchVO){
- return (List) dao.egovMeetingManageLisAuthorGroupPopup(searchVO);
+ return dao.egovMeetingManageLisAuthorGroupPopup(searchVO);
}
/**
@@ -59,7 +59,7 @@ public List egovMeetingManageLisAuthorGroupPopup(ComDefaultVO searchVO)
*/
@Override
public List egovMeetingManageLisEmpLyrPopup(ComDefaultVO searchVO){
- return (List) dao.egovMeetingManageLisEmpLyrPopup(searchVO);
+ return dao.egovMeetingManageLisEmpLyrPopup(searchVO);
}
/**
@@ -70,7 +70,7 @@ public List egovMeetingManageLisEmpLyrPopup(ComDefaultVO searchVO){
*/
@Override
public List selectMeetingManageList(ComDefaultVO searchVO) throws Exception{
- return (List) dao.selectMeetingManageList(searchVO);
+ return dao.selectMeetingManageList(searchVO);
}
/**
@@ -81,7 +81,7 @@ public List selectMeetingManageList(ComDefaultVO searchVO) throws Excep
*/
@Override
public List selectMeetingManageDetail(MeetingManageVO meetingManageVO) throws Exception{
- return (List) dao.selectMeetingManageDetail(meetingManageVO);
+ return dao.selectMeetingManageDetail(meetingManageVO);
}
/**
diff --git a/src/main/java/egovframework/com/uss/olp/qmc/web/EgovQustnrManageController.java b/src/main/java/egovframework/com/uss/olp/qmc/web/EgovQustnrManageController.java
index ac1f3a231..53196a254 100644
--- a/src/main/java/egovframework/com/uss/olp/qmc/web/EgovQustnrManageController.java
+++ b/src/main/java/egovframework/com/uss/olp/qmc/web/EgovQustnrManageController.java
@@ -30,6 +30,7 @@
import egovframework.com.uss.olp.qmc.service.EgovQustnrManageService;
import egovframework.com.uss.olp.qmc.service.QustnrManageVO;
import egovframework.com.utl.fcc.service.EgovStringUtil;
+
/**
* 설문관리를 처리하는 Controller Class 구현
* @author 공통서비스 장동한
@@ -170,7 +171,7 @@ public String egovQustnrManageList(
return "egovframework/com/uss/olp/qmc/EgovQustnrManageList";
}
- /**
+ /**
* 설문관리 목록을 상세조회 조회한다.
*
* @param searchVO
diff --git a/src/main/java/egovframework/com/uss/olp/qqm/service/EgovQustnrQestnManageService.java b/src/main/java/egovframework/com/uss/olp/qqm/service/EgovQustnrQestnManageService.java
index c4255c290..55934abf2 100644
--- a/src/main/java/egovframework/com/uss/olp/qqm/service/EgovQustnrQestnManageService.java
+++ b/src/main/java/egovframework/com/uss/olp/qqm/service/EgovQustnrQestnManageService.java
@@ -24,14 +24,14 @@
*/
public interface EgovQustnrQestnManageService {
- /**
- * 설문조사 응답자답변내용결과/기타답변내용결과 통계를 조회한다.
- *
- * @param Map - 설문지 정보가 담김 Parameter
- * @return Map
- * @throws Exception
- */
- public List selectQustnrManageStatistics2(Map map) throws Exception;
+ /**
+ * 설문조사 응답자답변내용결과/기타답변내용결과 통계를 조회한다.
+ *
+ * @param Map - 설문지 정보가 담김 Parameter
+ * @return Map
+ * @throws Exception
+ */
+ public List selectQustnrManageStatistics2(Map map) throws Exception;
/**
* 설문조사 통계를 조회한다.
diff --git a/src/main/java/egovframework/com/uss/olp/qqm/service/impl/EgovQustnrQestnManageServiceImpl.java b/src/main/java/egovframework/com/uss/olp/qqm/service/impl/EgovQustnrQestnManageServiceImpl.java
index 775d7253a..87dc9fb18 100644
--- a/src/main/java/egovframework/com/uss/olp/qqm/service/impl/EgovQustnrQestnManageServiceImpl.java
+++ b/src/main/java/egovframework/com/uss/olp/qqm/service/impl/EgovQustnrQestnManageServiceImpl.java
@@ -13,6 +13,7 @@
import egovframework.com.cmm.ComDefaultVO;
import egovframework.com.uss.olp.qqm.service.EgovQustnrQestnManageService;
import egovframework.com.uss.olp.qqm.service.QustnrQestnManageVO;
+
/**
* 설문문항을 처리하는 ServiceImpl Class 구현
* @author 공통서비스 장동한
@@ -40,17 +41,17 @@ public class EgovQustnrQestnManageServiceImpl extends EgovAbstractServiceImpl im
@Resource(name="egovQustnrQestnManageIdGnrService")
private EgovIdGnrService idgenService;
+
/**
- * 설문조사 응답자답변내용결과/기타답변내용결과 통계를 조회한다.
- *
- * @param Map - 설문지 정보가 담김 Parameter
- * @return Map
- * @throws Exception
- */
- @Override
- public List selectQustnrManageStatistics2(Map map) throws Exception {
- return dao.selectQustnrManageStatistics2(map);
- }
+ * 설문조사 응답자답변내용결과/기타답변내용결과 통계를 조회한다.
+ * @param Map - 설문지 정보가 담김 Parameter
+ * @return Map
+ * @throws Exception
+ */
+ @Override
+ public List selectQustnrManageStatistics2(Map map) throws Exception{
+ return dao.selectQustnrManageStatistics2(map);
+ }
/**
* 설문조사 통계를 조회한다.
diff --git a/src/main/java/egovframework/com/uss/olp/qqm/service/impl/QustnrQestnManageDao.java b/src/main/java/egovframework/com/uss/olp/qqm/service/impl/QustnrQestnManageDao.java
index 0dfb5b65f..dccc8d124 100644
--- a/src/main/java/egovframework/com/uss/olp/qqm/service/impl/QustnrQestnManageDao.java
+++ b/src/main/java/egovframework/com/uss/olp/qqm/service/impl/QustnrQestnManageDao.java
@@ -9,6 +9,7 @@
import egovframework.com.cmm.ComDefaultVO;
import egovframework.com.cmm.service.impl.EgovComAbstractDAO;
import egovframework.com.uss.olp.qqm.service.QustnrQestnManageVO;
+
/**
* 설문문항을 처리하는 Dao Class 구현
* @author 공통서비스 장동한
@@ -30,15 +31,14 @@
public class QustnrQestnManageDao extends EgovComAbstractDAO {
/**
- * 설문조사 응답자답변내용결과/기타답변내용결과 통계를 조회한다.
- *
- * @param Map - 설문지 정보가 담김 Parameter
- * @return Map
- * @throws Exception
- */
- public List selectQustnrManageStatistics2(Map map) throws Exception {
- return selectList("QustnrQestnManage.selectQustnrManageStatistics2", map);
- }
+ * 설문조사 응답자답변내용결과/기타답변내용결과 통계를 조회한다.
+ * @param Map - 설문지 정보가 담김 Parameter
+ * @return Map
+ * @throws Exception
+ */
+ public List selectQustnrManageStatistics2(Map map) throws Exception{
+ return selectList("QustnrQestnManage.selectQustnrManageStatistics2", map);
+ }
/**
* 설문조사 통계를 조회한다.
diff --git a/src/main/java/egovframework/com/uss/olp/qqm/web/EgovQustnrQestnManageController.java b/src/main/java/egovframework/com/uss/olp/qqm/web/EgovQustnrQestnManageController.java
index c63e7acd2..4f8563cb5 100644
--- a/src/main/java/egovframework/com/uss/olp/qqm/web/EgovQustnrQestnManageController.java
+++ b/src/main/java/egovframework/com/uss/olp/qqm/web/EgovQustnrQestnManageController.java
@@ -30,6 +30,7 @@
import egovframework.com.uss.olp.qqm.service.EgovQustnrQestnManageService;
import egovframework.com.uss.olp.qqm.service.QustnrQestnManageVO;
import egovframework.com.utl.fcc.service.EgovStringUtil;
+
/**
* 설문문항을 처리하는 Controller Class 구현
* @author 공통서비스 장동한
@@ -73,7 +74,7 @@ public class EgovQustnrQestnManageController {
/**
* 설문문항 통계를 조회한다.
- *
+ *
* @param searchVO
* @param qustnrQestnManageVO
* @param commandMap
@@ -81,7 +82,7 @@ public class EgovQustnrQestnManageController {
* @return "egovframework/com/uss/olp/qqm/EgovQustnrQestnManageStatistics"
* @throws Exception
*/
- @RequestMapping(value = "/uss/olp/qqm/EgovQustnrQestnManageStatistics.do")
+ @RequestMapping(value = "/uss/olp/qqm/EgovQustnrQestnManageStatistics.do")
public String egovQustnrQestnManageStatistics(@ModelAttribute("searchVO") ComDefaultVO searchVO, QustnrQestnManageVO qustnrQestnManageVO, @RequestParam Map commandMap, ModelMap model) throws Exception {
String sLocationUrl = "egovframework/com/uss/olp/qqm/EgovQustnrQestnManageStatistics";
@@ -222,7 +223,7 @@ public String egovQustnrQestnManageList(
/** 2017.09.04 model에 addAttribute 추가 */
model.addAttribute("searchKeyword", commandMap.get("searchKeyword") == null ? "" : (String)commandMap.get("searchKeyword"));
model.addAttribute("searchCondition", commandMap.get("searchCondition") == null ? "" : (String)commandMap.get("searchCondition"));
-
+
int totCnt = egovQustnrQestnManageService.selectQustnrQestnManageListCnt(searchVO);
paginationInfo.setTotalRecordCount(totCnt);
model.addAttribute("paginationInfo", paginationInfo);
diff --git a/src/main/java/egovframework/com/uss/olp/qri/service/EgovQustnrRespondInfoService.java b/src/main/java/egovframework/com/uss/olp/qri/service/EgovQustnrRespondInfoService.java
index c02648f92..c9961be0e 100644
--- a/src/main/java/egovframework/com/uss/olp/qri/service/EgovQustnrRespondInfoService.java
+++ b/src/main/java/egovframework/com/uss/olp/qri/service/EgovQustnrRespondInfoService.java
@@ -23,9 +23,7 @@
*
*/
public interface EgovQustnrRespondInfoService {
-
-
-
+
/**
* 설문템플릿을 조회한다.
* @param map - 조회할 정보가 담긴 map
@@ -34,16 +32,16 @@ public interface EgovQustnrRespondInfoService {
*/
public List selectQustnrTmplatManage(Map map) throws Exception;
- /**
- * 객관식 통계를 조회 조회한다.
- *
- * @param map - 조회할 정보가 담긴 map
- * @return List
- * @throws Exception
- */
- public List selectQustnrRespondInfoManageStatistics1(Map map) throws Exception;
-
- /**
+ /**
+ * 객관식 통계를 조회 조회한다.
+ *
+ * @param map - 조회할 정보가 담긴 map
+ * @return List
+ * @throws Exception
+ */
+ public List selectQustnrRespondInfoManageStatistics1(Map map) throws Exception;
+
+ /**
* 주관식 통계를 조회 조회한다.
*
* @param map - 조회할 정보가 담긴 map
@@ -61,14 +59,14 @@ public interface EgovQustnrRespondInfoService {
public Map selectQustnrRespondInfoManageEmplyrinfo(Map map) throws Exception;
/**
- * 설문정보를 조회한다.
+ * 설문정보를 조회한다.
*
* @param map - 조회할 정보가 담긴 map
* @return List
* @throws Exception
*/
public List selectQustnrRespondInfoManageComtnqestnrinfo(Map map) throws Exception;
-
+
/**
* 문항정보를 조회한다.
*
@@ -77,7 +75,7 @@ public interface EgovQustnrRespondInfoService {
* @throws Exception
*/
public List selectQustnrRespondInfoManageComtnqustnrqesitm(Map map) throws Exception;
-
+
/**
* 항목정보를 조회한다.
*
@@ -88,13 +86,12 @@ public interface EgovQustnrRespondInfoService {
public List selectQustnrRespondInfoManageComtnqustnriem(Map map) throws Exception;
/**
- * 설문조사(설문등록)를(을) 목록을 조회한다.
- *
- * @param searchVO - 조회할 정보가 담긴 VO
- * @return List
- * @throws Exception
- */
- public List selectQustnrRespondInfoManageList(ComDefaultVO searchVO) throws Exception;
+ * 설문조사(설문등록)를(을) 목록을 조회한다.
+ * @param searchVO - 조회할 정보가 담긴 VO
+ * @return List
+ * @throws Exception
+ */
+ public List selectQustnrRespondInfoManageList(ComDefaultVO searchVO) throws Exception;
/**
* 설문조사(설문등록)를(을) 목록 전체 건수를(을) 조회한다.
@@ -104,23 +101,23 @@ public interface EgovQustnrRespondInfoService {
*/
public int selectQustnrRespondInfoManageListCnt(ComDefaultVO searchVO) throws Exception;
- /**
- * 응답자결과(설문조사) 목록을 조회한다.
- *
- * @param searchVO - 조회할 정보가 담긴 VO
- * @return List
- * @throws Exception
- */
- public List selectQustnrRespondInfoList(ComDefaultVO searchVO) throws Exception;
+ /**
+ * 응답자결과(설문조사) 목록을 조회한다.
+ *
+ * @param searchVO - 조회할 정보가 담긴 VO
+ * @return List
+ * @throws Exception
+ */
+ public List selectQustnrRespondInfoList(ComDefaultVO searchVO) throws Exception;
- /**
- * 응답자결과(설문조사)를(을) 상세조회 한다.
- *
- * @param qustnrRespondInfoVO - 응답자결과(설문조사) 정보 담김 VO
- * @return List
- * @throws Exception
- */
- public List selectQustnrRespondInfoDetail(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception;
+ /**
+ * 응답자결과(설문조사)를(을) 상세조회 한다.
+ *
+ * @param qustnrRespondInfoVO - 응답자결과(설문조사) 정보 담김 VO
+ * @return List
+ * @throws Exception
+ */
+ public List selectQustnrRespondInfoDetail(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception;
/**
* 응답자결과(설문조사)를(을) 목록 전체 건수를(을) 조회한다.
@@ -151,13 +148,13 @@ public interface EgovQustnrRespondInfoService {
*/
void deleteQustnrRespondInfo(QustnrRespondInfoVO qustnrRespondInfoVO) throws Exception;
- /**
- * 설문템플릿 화이트리스트를 조회한다.
- *
- * @param map - 조회할 정보가 담긴 map
- * @return List
- * @throws Exception
- */
- public List selectQustnrTmplatWhiteList() throws Exception;
+ /**
+ * 설문템플릿 화이트리스트를 조회한다.
+ *
+ * @param map - 조회할 정보가 담긴 map
+ * @return List
+ * @throws Exception
+ */
+ public List selectQustnrTmplatWhiteList() throws Exception;
}
diff --git a/src/main/java/egovframework/com/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java b/src/main/java/egovframework/com/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java
index 28542cdd1..4fa067259 100644
--- a/src/main/java/egovframework/com/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java
+++ b/src/main/java/egovframework/com/uss/olp/qri/service/impl/EgovQustnrRespondInfoServiceImpl.java
@@ -13,6 +13,7 @@
import egovframework.com.cmm.ComDefaultVO;
import egovframework.com.uss.olp.qri.service.EgovQustnrRespondInfoService;
import egovframework.com.uss.olp.qri.service.QustnrRespondInfoVO;
+
/**
* 설문조사 ServiceImpl Class 구현
* @author 공통서비스 장동한
@@ -52,19 +53,19 @@ public List selectQustnrTmplatManage(Map map) throws Exception{
return dao.selectQustnrTmplatManage(map);
}
- /**
- * 객관식 통계를 조회 조회한다.
- *
- * @param map - 조회할 정보가 담긴 map
- * @return List
- * @throws Exception
- */
- @Override
- public List selectQustnrRespondInfoManageStatistics1(Map map) throws Exception {
- return dao.selectQustnrRespondInfoManageStatistics1(map);
- }
+ /**
+ * 객관식 통계를 조회 조회한다.
+ *
+ * @param map - 조회할 정보가 담긴 map
+ * @return List
+ * @throws Exception
+ */
+ @Override
+ public List selectQustnrRespondInfoManageStatistics1(Map map) throws Exception {
+ return dao.selectQustnrRespondInfoManageStatistics1(map);
+ }
- /**
+ /**
* 주관식 통계를 조회 조회한다.
*
* @param map - 조회할 정보가 담긴 map
diff --git a/src/main/java/egovframework/com/uss/olp/qri/service/impl/QustnrRespondInfoDao.java b/src/main/java/egovframework/com/uss/olp/qri/service/impl/QustnrRespondInfoDao.java
index 57f35a4e8..39b4a6c65 100644
--- a/src/main/java/egovframework/com/uss/olp/qri/service/impl/QustnrRespondInfoDao.java
+++ b/src/main/java/egovframework/com/uss/olp/qri/service/impl/QustnrRespondInfoDao.java
@@ -40,18 +40,18 @@ public List selectQustnrTmplatManage(Map map) throws Exception{
return selectList("QustnrRespondInfo.selectQustnrTmplatManages", map);
}
- /**
- * 객관식 통계를 조회 조회한다.
- *
- * @param map - 조회할 정보가 담긴 map
- * @return List
- * @throws Exception
- */
- public List selectQustnrRespondInfoManageStatistics1(Map map) throws Exception {
- return selectList("QustnrRespondInfo.selectQustnrRespondInfoManageStatistics1", map);
- }
+ /**
+ * 객관식 통계를 조회 조회한다.
+ *
+ * @param map - 조회할 정보가 담긴 map
+ * @return List
+ * @throws Exception
+ */
+ public List selectQustnrRespondInfoManageStatistics1(Map map) throws Exception {
+ return selectList("QustnrRespondInfo.selectQustnrRespondInfoManageStatistics1", map);
+ }
- /**
+ /**
* 주관식 통계를 조회 조회한다.
*
* @param map - 조회할 정보가 담긴 map
diff --git a/src/main/java/egovframework/com/uss/olp/qri/web/EgovQustnrRespondInfoController.java b/src/main/java/egovframework/com/uss/olp/qri/web/EgovQustnrRespondInfoController.java
index 40f488511..5a88d05b0 100644
--- a/src/main/java/egovframework/com/uss/olp/qri/web/EgovQustnrRespondInfoController.java
+++ b/src/main/java/egovframework/com/uss/olp/qri/web/EgovQustnrRespondInfoController.java
@@ -34,6 +34,7 @@
import egovframework.com.uss.olp.qri.service.QustnrRespondInfoVO;
import egovframework.com.uss.olp.qrm.service.EgovQustnrRespondManageService;
import egovframework.com.uss.olp.qrm.service.QustnrRespondManageVO;
+
/**
* 설문조사 Controller Class 구현
* @author 공통서비스 장동한
@@ -79,7 +80,8 @@ public class EgovQustnrRespondInfoController {
@Resource(name="EgovCmmUseService")
private EgovCmmUseService cmmUseService;
- /**
+
+ /**
* 설문템플릿을 적용한다.
*
* @param searchVO
@@ -136,7 +138,7 @@ public String egovQustnrRespondInfoManageTemplate(@ModelAttribute("searchVO") Co
return sTemplateUrl;
}
}
-
+
LOGGER.debug("QustnrTmplat > WhiteList mismatch! Please check Admin page!");
return "egovframework/com/cmm/egovError";
}
@@ -185,7 +187,7 @@ public String egovQustnrRespondInfoManageStatistics(
return sLocationUrl;
}
- /**
+ /**
* 설문조사(설문등록) 목록을 조회한다.
*
* @param searchVO
@@ -243,7 +245,7 @@ public String egovQustnrRespondInfoManageRegist(
HttpServletRequest request,
ModelMap model)
throws Exception {
-
+
// 0. Spring Security 사용자권한 처리
Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated();
if(!isAuthenticated) {
@@ -288,9 +290,9 @@ public String egovQustnrRespondInfoManageRegist(
//설문조사 등록
//객관식 답안 처리
if( commandMap.get("TY_"+key).equals("1") ){
-
+
String[] arrayParam = request.getParameterValues(key.toString());
-
+
if( arrayParam.length == 1 ){
sVal = arrayParam[0];
@@ -391,7 +393,7 @@ public String egovQustnrRespondInfoManageRegist(
//사용자정보
model.addAttribute("Emplyrinfo", egovQustnrRespondInfoService.selectQustnrRespondInfoManageEmplyrinfo(commandMap));
}
-
+
//설문템플릿정보
model.addAttribute("QustnrTmplatManage", egovQustnrRespondInfoService.selectQustnrTmplatManage(commandMap));
@@ -411,7 +413,7 @@ public String egovQustnrRespondInfoManageRegist(
return sLocationUrl;
}
- /**
+ /**
* 응답자결과(설문조사) 목록을 조회한다.
*
* @param searchVO
diff --git a/src/main/java/egovframework/com/uss/olp/qtm/service/EgovQustnrTmplatManageService.java b/src/main/java/egovframework/com/uss/olp/qtm/service/EgovQustnrTmplatManageService.java
index b8c0cd209..3ab9339ad 100644
--- a/src/main/java/egovframework/com/uss/olp/qtm/service/EgovQustnrTmplatManageService.java
+++ b/src/main/java/egovframework/com/uss/olp/qtm/service/EgovQustnrTmplatManageService.java
@@ -6,82 +6,85 @@
import org.egovframe.rte.psl.dataaccess.util.EgovMap;
import egovframework.com.cmm.ComDefaultVO;
+
/**
* 설문템플릿 Service Class 구현
+ *
* @author 공통서비스 장동한
* @since 2009.03.20
* @version 1.0
* @see
*
- *