From 0617670c0815b8ae5abe7206c7712e90943c8deb Mon Sep 17 00:00:00 2001 From: JIWOO Date: Mon, 23 Sep 2024 09:37:19 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EB=B6=84?= =?UTF-8?q?=EC=9F=81=EC=A1=B0=EC=A0=95=20=EA=B2=8C=EC=8B=9C=ED=8C=90=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/seed/com/gtm/dao/TeamBoardDao.java | 14 ++ .../seed/com/gtm/dao/TeamBoardDaoImpl.java | 49 +++++ .../com/gtm/team/TeamBoardController.java | 132 ++++++++++++ .../seed/com/gtm/team/TeamBoardService.java | 43 ++++ .../sqlmap/config/mappers/team/team_sql.xml | 135 ++++++++++++ .../WEB-INF/jsp/seed/_extra/gtm/team/edit.jsp | 162 +++++++++++++++ .../WEB-INF/jsp/seed/_extra/gtm/team/list.jsp | 168 +++++++++++++++ .../WEB-INF/jsp/seed/_extra/gtm/team/view.jsp | 110 ++++++++++ .../jsp/seed/_extra/gtm/team/write.jsp | 193 ++++++++++++++++++ 9 files changed, 1006 insertions(+) create mode 100644 src/main/java/seed/com/gtm/dao/TeamBoardDao.java create mode 100644 src/main/java/seed/com/gtm/dao/TeamBoardDaoImpl.java create mode 100644 src/main/java/seed/com/gtm/team/TeamBoardController.java create mode 100644 src/main/java/seed/com/gtm/team/TeamBoardService.java create mode 100644 src/main/resources/egovframework/sqlmap/config/mappers/team/team_sql.xml create mode 100644 src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/edit.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/list.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/view.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/write.jsp diff --git a/src/main/java/seed/com/gtm/dao/TeamBoardDao.java b/src/main/java/seed/com/gtm/dao/TeamBoardDao.java new file mode 100644 index 00000000..60cb9ee0 --- /dev/null +++ b/src/main/java/seed/com/gtm/dao/TeamBoardDao.java @@ -0,0 +1,14 @@ +package seed.com.gtm.dao; + +import java.util.List; +import java.util.Map; + +public interface TeamBoardDao { + public void boardInsert(Map paramMap); + public List> boardList(Map paramMap); + public int boardListCnt(Map paramMap); + public Map boardView(Map paramMap); + public void boardUpdate(Map paramMap); + public void boardDel(Map paramMap); + public void cntUpdate(Map paramMap); +} diff --git a/src/main/java/seed/com/gtm/dao/TeamBoardDaoImpl.java b/src/main/java/seed/com/gtm/dao/TeamBoardDaoImpl.java new file mode 100644 index 00000000..1583c66f --- /dev/null +++ b/src/main/java/seed/com/gtm/dao/TeamBoardDaoImpl.java @@ -0,0 +1,49 @@ +package seed.com.gtm.dao; + +import java.util.List; +import java.util.Map; + +import org.apache.ibatis.session.SqlSession; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Repository; + +@Repository +public class TeamBoardDaoImpl implements TeamBoardDao { + @Autowired + private SqlSession sqlSession; + + @Override + public void boardInsert(Map paramMap) { + sqlSession.insert("team.insert", paramMap); + } + + @Override + public List> boardList(Map paramMap) { + return sqlSession.selectList("team.select", paramMap); + } + + @Override + public int boardListCnt(Map paramMap) { + return sqlSession.selectOne("team.selectCnt", paramMap); + } + + @Override + public Map boardView(Map paramMap) { + return sqlSession.selectOne("team.selectOne", paramMap); + } + + @Override + public void boardUpdate(Map paramMap) { + sqlSession.update("team.update", paramMap); + } + + @Override + public void boardDel(Map paramMap) { + sqlSession.update("team.delete", paramMap); + } + + @Override + public void cntUpdate(Map paramMap) { + sqlSession.update("team.cntUpdate", paramMap); + } +} diff --git a/src/main/java/seed/com/gtm/team/TeamBoardController.java b/src/main/java/seed/com/gtm/team/TeamBoardController.java new file mode 100644 index 00000000..dd693731 --- /dev/null +++ b/src/main/java/seed/com/gtm/team/TeamBoardController.java @@ -0,0 +1,132 @@ +package seed.com.gtm.team; + +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; + +import seed.com.gtm.seedfile.SeedFileService; +import seed.com.gtm.util.SeedCriteria; +import seed.com.gtm.util.PageMaker; + +@Controller +@RequestMapping("/gtm/case") +public class TeamBoardController { + @Autowired + private TeamBoardService service; + + @Autowired + private SeedFileService fileService; + + @RequestMapping(value="/team/board/write.do", method=RequestMethod.GET) + public String teamWrite(ModelMap model, @RequestParam Map paramMap){ + return "/seed/_extra/gtm/team/write"; + } + + @RequestMapping(value="/team/board/write.do", method=RequestMethod.POST) + public String teamWrite(HttpServletRequest request ,HttpSession session, @RequestParam Map paramMap, Map map){ + + paramMap.put("memberName", session.getAttribute("memberName")); + paramMap.put("memberId", session.getAttribute("memberId")); + paramMap.put("memberDept", session.getAttribute("memberDept")); + paramMap.put("memberPosition", session.getAttribute("memberPosition")); + service.boardInsert(paramMap); + + //현제 등록된 게시글의 시퀀스 불러와 맵에 저장 + paramMap.put("dataIdx", paramMap.get("seq")); + fileService.fileInsert(paramMap, request, session); + + map.put("message", "common.message.reg"); + map.put("url", "/gtm/case/team/board/list.do"); + + return "/_common/jsp/message"; + } + + @RequestMapping("/team/board/list.do") + public String teamList(ModelMap model, HttpSession session, SeedCriteria cri,@RequestParam Map paramMap){ + + //로그인페이지로 튕겨나가지 않게 우선은 임시방편 + session.setAttribute("siteIdx", "case"); + + + //페이징 관련 + paramMap.put("pageStart", cri.getPageStart()); + paramMap.put("perPageNum", cri.getPerPageNum()); + paramMap.put("memberDept", session.getAttribute("memberDept")); + List> bbsList = service.boardList(paramMap); + + PageMaker pageMaker = new PageMaker(); + pageMaker.setCri(cri); + pageMaker.setTotalCount(service.boardListCnt(paramMap)); + + model.addAttribute("bbsList", bbsList); + model.addAttribute("pageMaker", pageMaker); + + return "/seed/_extra/gtm/team/list"; + } + + @RequestMapping("/team/board/view.do") + public String teamView(ModelMap model, @RequestParam Map paramMap){ + + paramMap.put("dataIdx", paramMap.get("teamNo")); + model.addAttribute("bbsView", service.boardView(paramMap)); + model.addAttribute("fileList", fileService.fileList(paramMap)); + service.cntUpdate(paramMap); + return "/seed/_extra/gtm/team/view"; + } + + @RequestMapping(value="/team/board/edit.do", method=RequestMethod.GET) + public String teamEdit(ModelMap model, @RequestParam Map paramMap){ + + + paramMap.put("dataIdx", paramMap.get("teamNo")); + List> fileList = fileService.fileList(paramMap); + + model.addAttribute("bbsView", service.boardView(paramMap)); + model.addAttribute("fileList", fileList); + model.addAttribute("fileListSize", fileList.size()); + + return "/seed/_extra/gtm/team/edit"; + } + + @RequestMapping(value="/team/board/edit.do", method=RequestMethod.POST) + public String teamEdit(HttpSession session, HttpServletRequest request, @RequestParam Map paramMap, Map map){ + paramMap.put("memberId", session.getAttribute("memberId")); + paramMap.put("dataIdx", paramMap.get("teamNo"));//fileInsert에서 필요 + + service.boardUpdate(paramMap); + fileService.fileInsert(paramMap, request, session); + fileService.fileDel(paramMap); + + map.put("message", "common.message.mod"); + map.put("url", "/gtm/case/team/board/view.do?teamNo=" + paramMap.get("teamNo") + + "&searchType=" + paramMap.get("searchType") + "&searchTilte=" + paramMap.get("searchTilte") + "&page=" + paramMap.get("page")+ + "&fileFuncType=" + paramMap.get("fileFuncType") + ); + + return "/_common/jsp/message"; + } + + @RequestMapping("team/board/bbsDel.do") + public String teamDel(HttpSession session, @RequestParam Map paramMap, Map map){ + paramMap.put("dataIdx", paramMap.get("teamNo")); + service.boardDel(paramMap); + fileService.fileDelAll(paramMap); + + map.put("message", "common.message.del"); + map.put("url", "/gtm/case/team/board/list.do?searchType=" + paramMap.get("searchType") + + "&searchTilte=" + paramMap.get("searchTilte") + "&page=" + paramMap.get("page") + ); + + return "/_common/jsp/message"; + } + +} diff --git a/src/main/java/seed/com/gtm/team/TeamBoardService.java b/src/main/java/seed/com/gtm/team/TeamBoardService.java new file mode 100644 index 00000000..1b7d2917 --- /dev/null +++ b/src/main/java/seed/com/gtm/team/TeamBoardService.java @@ -0,0 +1,43 @@ +package seed.com.gtm.team; + +import java.util.List; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import seed.com.gtm.dao.TeamBoardDao; + +@Service +public class TeamBoardService { + @Autowired + private TeamBoardDao dao; + + public void boardInsert(Map paramMap){ + dao.boardInsert(paramMap); + } + + public List> boardList(Map paramMap){ + return dao.boardList(paramMap); + } + + public int boardListCnt(Map paramMap){ + return dao.boardListCnt(paramMap); + } + + public Map boardView(Map paramMap){ + return dao.boardView(paramMap); + } + + public void boardUpdate(Map paramMap){ + dao.boardUpdate(paramMap); + } + + public void boardDel(Map paramMap){ + dao.boardDel(paramMap); + } + + public void cntUpdate(Map paramMap){ + dao.cntUpdate(paramMap); + } +} diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/team/team_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/team/team_sql.xml new file mode 100644 index 00000000..7e6986f5 --- /dev/null +++ b/src/main/resources/egovframework/sqlmap/config/mappers/team/team_sql.xml @@ -0,0 +1,135 @@ + + + + + + + select C_TEAMBOARD_SEQ.NEXTVAL FROM DUAL + + INSERT INTO C_TEAMBOARD( + TEAM_NO, + TEAM_TITLE, + TEAM_CONTENT, + TEAM_CNT, + TEAM_REGID, + TEAM_REGNM, + TEAM_REGDATE, + TEAM_MODID, + TEAM_MODDATE, + TEAM_GUBUN, + DEL_YN, + TEAM_PART + ) VALUES ( + ${seq}, + #{teamTitle}, + #{editorParam_teamContent}, + 0, + #{memberId}, + #{memberName}, + SYSDATE, + #{memberId}, + SYSDATE, + #{memberDept}, + 'N', + #{memberPosition} + ) + + + + + + + + + + UPDATE C_TEAMBOARD + SET TEAM_TITLE = #{teamTitle}, + TEAM_CONTENT = #{editorParam_teamContent}, + TEAM_MODID = #{memberId}, + TEAM_MODDATE = SYSDATE + WHERE TEAM_NO = #{teamNo} + + + + UPDATE C_TEAMBOARD + SET DEL_YN = 'Y' + WHERE TEAM_NO = #{teamNo} + + + + UPDATE C_TEAMBOARD + SET TEAM_CNT = TEAM_CNT+1 + WHERE TEAM_NO = #{teamNo} + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/edit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/edit.jsp new file mode 100644 index 00000000..4f07bcef --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/edit.jsp @@ -0,0 +1,162 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form"%> + + + +정보 관리 + + + + + + + + + +
+
+

팀 게시판

+
+ +
+

팀 게시판을 수정 할 수 있는 페이지 입니다.

+
+
+
+
+ + + + + + + +
+
+
+

제목

+
+ +
+
+
+

작성자

+
+ ${memberName} +
+
+
+

첨부자료

+
+
+ +
+
    + +
  • + gif  ${list.EXTRA_FILE_NAME} + 삭제 + +
    • +     +
+ + + +
+
+
+

내용

+
+ +
+
+
+ +
+ + 목록 +
+
+ + +
+ +
+ +
+
+
+ + + + +
+ + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/list.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/list.jsp new file mode 100644 index 00000000..48238671 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/list.jsp @@ -0,0 +1,168 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form"%> + + + +정보 관리 + + + + + + + + + +
+
+

팀 게시판

+
+ +
+

팀 게시판에 대한 목록 화면 입니다.

+
+
+
+
+
+ + + +
+ + + + +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
분쟁조정 사례 테이블입니다.
번호구분제목작성자작성일조회수
${(pageMaker.totalCount - ((pageMaker.cri.page-1)*pageMaker.cri.perPageNum)) - status.index}${list.TEAM_GUBUN_NM}${list.TEAM_TITLE}${list.TEAM_REGNM}${list.TEAM_REGDATE}${list.TEAM_CNT}
+
+ +
+
+ +
+
+
+ + +
+
+ + + + + +
+
+ + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/view.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/view.jsp new file mode 100644 index 00000000..31b86a19 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/view.jsp @@ -0,0 +1,110 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form"%> + + + +정보 관리 + + + + + + + + + +
+
+

팀 게시판

+
+ +
+

팀 게시판 상세 페이지 입니다.

+
+
+
+
+ +
+
+

제목

+
+ ${bbsView.TEAM_TITLE} +
+
+
+

구분

+
+ ${bbsView.TEAM_GUBUN_NM} +
+
+
+

작성자

+
+ ${bbsView.TEAM_REGNM} +
+
+
+

작성일

+
+ ${bbsView.TEAM_REGDATE} +
+
+
+

조회수

+
+ ${bbsView.TEAM_CNT} +
+
+
+

첨부자료

+
+ + + +
+
+
+

내용

+
+ ${bbsView.TEAM_CONTENT} +
+
+
+
+ + + 목록 +
+
+ + + + + + +
+ + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/write.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/write.jsp new file mode 100644 index 00000000..aa0a8c5a --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/team/write.jsp @@ -0,0 +1,193 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form"%> + + + +정보 관리 + + + + + + + + +
+
+

팀 게시판

+
+ +
+

팀 게시판을 등록 할 수 있는 페이지 입니다.

+
+
+
+
+ + <%-- --%> + +
+
+
+

제목

+
+ +
+
+
+

구분

+
+ + + 한국공정거래조정원 + + + 운영지원팀 + + + 분쟁조정실 + + + 공정거래팀 + + + 가맹거래팀 + + + 건설하도급팀 + + + 제조하도급팀 + + + 약관팀 + + + 유통팀 + + + 대리점팀 + + + 민원상담센터 + + + 관리팀 + + +
+
+
+

작성자

+
+ ${memberName} +
+
+
+

첨부자료

+
+
+ +
+
    + +
+ + + +
+
+
+

내용

+
+ +
+
+
+
+ + 목록 +
+
+ + +
+ +
+ +
+
+
+ + + + +
+ + + + + \ No newline at end of file From 7bcb0ee0f1c19d9aace280a565d1f2447aadc22a Mon Sep 17 00:00:00 2001 From: JIWOO Date: Mon, 23 Sep 2024 11:07:25 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20SeedCrite?= =?UTF-8?q?ria=20>=20Criteria=20=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD(Se?= =?UTF-8?q?edCriteria=20=EC=82=AC=EC=9A=A9=20=20=EC=8B=9C=20ajax=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/seed/com/gtm/base/BaseController.java | 4 ++-- src/main/java/seed/com/gtm/board/CaseBoardController.java | 4 ++-- .../java/seed/com/gtm/counsel/OnlineCounselController.java | 5 ++--- src/main/java/seed/com/gtm/exam/ExamBoardController.java | 4 ++-- src/main/java/seed/com/gtm/faqbbs/faqBoardController.java | 4 ++-- src/main/java/seed/com/gtm/join/MemberJoinController.java | 4 ++-- src/main/java/seed/com/gtm/news/NewsLetterController.java | 4 ++-- src/main/java/seed/com/gtm/sample/SampleController.java | 6 +++--- src/main/java/seed/com/gtm/team/TeamBoardController.java | 4 ++-- .../com/gtm/trublchargermng/TrublchargermngController.java | 4 ++-- src/main/java/seed/com/gtm/util/PageMaker.java | 6 +++--- src/main/java/seed/com/user/news/NewsController.java | 6 +++--- 12 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/main/java/seed/com/gtm/base/BaseController.java b/src/main/java/seed/com/gtm/base/BaseController.java index e09aeeeb..de1cc053 100644 --- a/src/main/java/seed/com/gtm/base/BaseController.java +++ b/src/main/java/seed/com/gtm/base/BaseController.java @@ -36,7 +36,7 @@ import seed.com.gtm.util.JSPUtil; import seed.com.gtm.util.Nanum; import seed.com.gtm.util.Nice; import seed.com.gtm.util.PageMaker; -import seed.com.gtm.util.SeedCriteria; +import seed.com.gtm.util.Criteria; import seed.utils.ApplicationProperty; import seed.utils.SeedUtils; @@ -67,7 +67,7 @@ public class BaseController { @RequestMapping(value = "/gtm/case/{pageFolder}/{pageName}/{pageAction}.do") public ModelAndView getManagerPage(HttpServletRequest request, HttpSession session, Map map, - SeedCriteria cri, + Criteria cri, @PathVariable(value="pageFolder") String pageFolder, @PathVariable(value="pageName") String pageName, @PathVariable(value="pageAction") String pageAction diff --git a/src/main/java/seed/com/gtm/board/CaseBoardController.java b/src/main/java/seed/com/gtm/board/CaseBoardController.java index 2ea0f2d8..189929fd 100644 --- a/src/main/java/seed/com/gtm/board/CaseBoardController.java +++ b/src/main/java/seed/com/gtm/board/CaseBoardController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam; import seed.com.gtm.seedfile.SeedFileService; import seed.com.gtm.util.PageMaker; -import seed.com.gtm.util.SeedCriteria; +import seed.com.gtm.util.Criteria; @Controller @RequestMapping("/gtm/case") @@ -62,7 +62,7 @@ public class CaseBoardController { // /gtm/case/board/form/list.do @RequestMapping("/board/{boardIdx}/list.do") - public String boardList(ModelMap model, HttpSession session, SeedCriteria cri,@RequestParam Map paramMap, @PathVariable(value="boardIdx") String boardIdx){ + public String boardList(ModelMap model, HttpSession session, Criteria cri,@RequestParam Map paramMap, @PathVariable(value="boardIdx") String boardIdx){ //로그인페이지로 튕겨나가지 않게 우선은 임시방편 session.setAttribute("siteIdx", "case"); diff --git a/src/main/java/seed/com/gtm/counsel/OnlineCounselController.java b/src/main/java/seed/com/gtm/counsel/OnlineCounselController.java index b3dde458..17d27447 100644 --- a/src/main/java/seed/com/gtm/counsel/OnlineCounselController.java +++ b/src/main/java/seed/com/gtm/counsel/OnlineCounselController.java @@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestParam; import seed.com.gtm.seedfile.SeedFileService; import seed.com.gtm.util.Criteria; import seed.com.gtm.util.PageMaker; -import seed.com.gtm.util.SeedCriteria; import seed.com.user.counsel.CounselService; import seed.utils.SeedUtils; @@ -41,7 +40,7 @@ public class OnlineCounselController { // /gtm/case/onlineCounsel/list.do @RequestMapping("/onlineCounsel/list.do") - public String counselList(ModelMap model, HttpSession session, @RequestParam Map paramMap, Map map, SeedCriteria cri){ + public String counselList(ModelMap model, HttpSession session, @RequestParam Map paramMap, Map map, Criteria cri){ session.setAttribute("siteIdx", "case"); //페이징 관련 paramMap.put("pageStart", cri.getPageStart()); @@ -219,7 +218,7 @@ public class OnlineCounselController { // /gtm/case/onlineCounsel/lawList.do @RequestMapping("/onlineCounsel/lawList.do") - public String lawCounselList(ModelMap model, HttpSession session, @RequestParam Map paramMap, Map map, SeedCriteria cri){ + public String lawCounselList(ModelMap model, HttpSession session, @RequestParam Map paramMap, Map map, Criteria cri){ session.setAttribute("siteIdx", "case"); //페이징 관련 paramMap.put("pageStart", cri.getPageStart()); diff --git a/src/main/java/seed/com/gtm/exam/ExamBoardController.java b/src/main/java/seed/com/gtm/exam/ExamBoardController.java index 03142f37..7b0a6952 100644 --- a/src/main/java/seed/com/gtm/exam/ExamBoardController.java +++ b/src/main/java/seed/com/gtm/exam/ExamBoardController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam; import seed.com.gtm.seedfile.SeedFileService; import seed.com.gtm.util.PageMaker; -import seed.com.gtm.util.SeedCriteria; +import seed.com.gtm.util.Criteria; import seed.utils.SeedDbUtilsSupport; @Controller @@ -65,7 +65,7 @@ public class ExamBoardController { } @RequestMapping("exam/{boardIdx}/list.do") - public String examList(ModelMap model, HttpSession session, SeedCriteria cri,@RequestParam Map paramMap, @PathVariable(value="boardIdx") String boardIdx){ + public String examList(ModelMap model, HttpSession session, Criteria cri,@RequestParam Map paramMap, @PathVariable(value="boardIdx") String boardIdx){ //로그인페이지로 튕겨나가지 않게 우선은 임시방편 session.setAttribute("siteIdx", "case"); diff --git a/src/main/java/seed/com/gtm/faqbbs/faqBoardController.java b/src/main/java/seed/com/gtm/faqbbs/faqBoardController.java index 8c396770..1f2a035f 100644 --- a/src/main/java/seed/com/gtm/faqbbs/faqBoardController.java +++ b/src/main/java/seed/com/gtm/faqbbs/faqBoardController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import seed.com.gtm.util.PageMaker; -import seed.com.gtm.util.SeedCriteria; +import seed.com.gtm.util.Criteria; @Controller @RequestMapping("/gtm/case") @@ -59,7 +59,7 @@ public class faqBoardController { } @RequestMapping("/faqBbs/list.do") - public String faqBbsList(HttpSession session, ModelMap model, @RequestParam Map paramMap, SeedCriteria cri){ + public String faqBbsList(HttpSession session, ModelMap model, @RequestParam Map paramMap, Criteria cri){ //로그인페이지로 튕겨나가지 않게 우선은 임시방편 session.setAttribute("siteIdx", "case"); diff --git a/src/main/java/seed/com/gtm/join/MemberJoinController.java b/src/main/java/seed/com/gtm/join/MemberJoinController.java index 1167228b..48b2524e 100644 --- a/src/main/java/seed/com/gtm/join/MemberJoinController.java +++ b/src/main/java/seed/com/gtm/join/MemberJoinController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import seed.com.gtm.util.PageMaker; -import seed.com.gtm.util.SeedCriteria; +import seed.com.gtm.util.Criteria; import seed.utils.SeedUtils; @Controller @@ -112,7 +112,7 @@ public class MemberJoinController { } @RequestMapping("/join/list.do") - public String joinList(ModelMap model, HttpSession session, @RequestParam Map paramMap, SeedCriteria cri){ + public String joinList(ModelMap model, HttpSession session, @RequestParam Map paramMap, Criteria cri){ session.setAttribute("siteIdx", "case"); diff --git a/src/main/java/seed/com/gtm/news/NewsLetterController.java b/src/main/java/seed/com/gtm/news/NewsLetterController.java index 8ec7b31b..e75cf5e2 100644 --- a/src/main/java/seed/com/gtm/news/NewsLetterController.java +++ b/src/main/java/seed/com/gtm/news/NewsLetterController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import seed.com.gtm.util.PageMaker; -import seed.com.gtm.util.SeedCriteria; +import seed.com.gtm.util.Criteria; @Controller @RequestMapping("/gtm/case") @@ -39,7 +39,7 @@ public class NewsLetterController { } @RequestMapping("/news/list.do") - public String newsList(ModelMap model, HttpSession session, @RequestParam Map paramMap, SeedCriteria cri){ + public String newsList(ModelMap model, HttpSession session, @RequestParam Map paramMap, Criteria cri){ System.out.println("paramMap :: "+paramMap.toString()); diff --git a/src/main/java/seed/com/gtm/sample/SampleController.java b/src/main/java/seed/com/gtm/sample/SampleController.java index 3bf226f0..4c5c710e 100644 --- a/src/main/java/seed/com/gtm/sample/SampleController.java +++ b/src/main/java/seed/com/gtm/sample/SampleController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam; import seed.com.gtm.seedfile.SeedFileService; import seed.com.gtm.util.PageMaker; -import seed.com.gtm.util.SeedCriteria; +import seed.com.gtm.util.Criteria; @Controller @RequestMapping("/gtm/sample") @@ -124,7 +124,7 @@ public class SampleController { //목록화면 @RequestMapping("/board/{boardIdx}/list.do") - public String boardList(ModelMap model, HttpSession session, SeedCriteria cri,@RequestParam Map paramMap, @PathVariable(value="boardIdx") String boardIdx){ + public String boardList(ModelMap model, HttpSession session, Criteria cri,@RequestParam Map paramMap, @PathVariable(value="boardIdx") String boardIdx){ //로그인페이지로 튕겨나가지 않게 우선은 임시방편 session.setAttribute("siteIdx", "case"); @@ -143,7 +143,7 @@ public class SampleController { } session.setAttribute("menuName", menuName); - //페이징 관련 - Criteria 이름 중복으로 인하여 SeedCriteria로 이름 변경 후 사용 + //페이징 관련 - Criteria 이름 중복으로 인하여 Criteria로 이름 변경 후 사용 paramMap.put("pageStart", cri.getPageStart()); paramMap.put("perPageNum", cri.getPerPageNum()); paramMap.put("boardIdx", boardIdx); diff --git a/src/main/java/seed/com/gtm/team/TeamBoardController.java b/src/main/java/seed/com/gtm/team/TeamBoardController.java index dd693731..69b37b61 100644 --- a/src/main/java/seed/com/gtm/team/TeamBoardController.java +++ b/src/main/java/seed/com/gtm/team/TeamBoardController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import seed.com.gtm.seedfile.SeedFileService; -import seed.com.gtm.util.SeedCriteria; +import seed.com.gtm.util.Criteria; import seed.com.gtm.util.PageMaker; @Controller @@ -51,7 +51,7 @@ public class TeamBoardController { } @RequestMapping("/team/board/list.do") - public String teamList(ModelMap model, HttpSession session, SeedCriteria cri,@RequestParam Map paramMap){ + public String teamList(ModelMap model, HttpSession session, Criteria cri,@RequestParam Map paramMap){ //로그인페이지로 튕겨나가지 않게 우선은 임시방편 session.setAttribute("siteIdx", "case"); diff --git a/src/main/java/seed/com/gtm/trublchargermng/TrublchargermngController.java b/src/main/java/seed/com/gtm/trublchargermng/TrublchargermngController.java index ea5dff5e..cebb640e 100644 --- a/src/main/java/seed/com/gtm/trublchargermng/TrublchargermngController.java +++ b/src/main/java/seed/com/gtm/trublchargermng/TrublchargermngController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import seed.com.gtm.seedfile.SeedFileService; import seed.com.gtm.util.PageMaker; -import seed.com.gtm.util.SeedCriteria; +import seed.com.gtm.util.Criteria; import seed.utils.SeedUtils; @Controller @@ -109,7 +109,7 @@ public class TrublchargermngController { // /gtm/case/trublchargermng/list.do @RequestMapping("/trublchargermng/list.do") - public String joinList(ModelMap model, HttpSession session, @RequestParam Map paramMap, SeedCriteria cri){ + public String joinList(ModelMap model, HttpSession session, @RequestParam Map paramMap, Criteria cri){ session.setAttribute("siteIdx", "case"); diff --git a/src/main/java/seed/com/gtm/util/PageMaker.java b/src/main/java/seed/com/gtm/util/PageMaker.java index 5eddf4a3..a52f6fef 100644 --- a/src/main/java/seed/com/gtm/util/PageMaker.java +++ b/src/main/java/seed/com/gtm/util/PageMaker.java @@ -8,9 +8,9 @@ public class PageMaker { private boolean next; private int displayPageNum = 10; - private SeedCriteria cri; + private Criteria cri; - public void setCri(SeedCriteria cri){ + public void setCri(Criteria cri){ this.cri = cri; } @@ -60,7 +60,7 @@ public class PageMaker { return displayPageNum; } - public SeedCriteria getCri(){ + public Criteria getCri(){ return cri; } } diff --git a/src/main/java/seed/com/user/news/NewsController.java b/src/main/java/seed/com/user/news/NewsController.java index 0254b304..1e9f7b78 100644 --- a/src/main/java/seed/com/user/news/NewsController.java +++ b/src/main/java/seed/com/user/news/NewsController.java @@ -22,7 +22,7 @@ import org.springframework.web.servlet.ModelAndView; import com.ibm.icu.text.SimpleDateFormat; -import seed.com.gtm.util.SeedCriteria; +import seed.com.gtm.util.Criteria; import seed.manager.group.service.ManagerGroupService; import seed.manager.member.service.ManagerMemberService; import seed.manager.site.service.ManagerSiteManagerService; @@ -220,7 +220,7 @@ private Logger log = Logger.getLogger(this.getClass()); // /user/news/case/01/322/regReq.do @RequestMapping(value="/user/news/{siteIdx}/01/{siteMenuIdx}/regReq.do", method=RequestMethod.POST) - public ModelAndView regReq(ModelMap map, HttpSession session, HttpServletRequest req, HttpServletResponse res, @RequestParam Map paramMap, SeedCriteria cri, + public ModelAndView regReq(ModelMap map, HttpSession session, HttpServletRequest req, HttpServletResponse res, @RequestParam Map paramMap, Criteria cri, @PathVariable(value="siteIdx") String siteIdx, @PathVariable(value="siteMenuIdx") Integer siteMenuIdx ){ @@ -386,7 +386,7 @@ private Logger log = Logger.getLogger(this.getClass()); // /user/news/case/01/322/delReq.do @RequestMapping(value="/user/news/{siteIdx}/01/{siteMenuIdx}/delReq.do", method=RequestMethod.POST) - public ModelAndView delReq(ModelMap map, HttpSession session, HttpServletRequest req, HttpServletResponse res, @RequestParam Map paramMap, SeedCriteria cri, + public ModelAndView delReq(ModelMap map, HttpSession session, HttpServletRequest req, HttpServletResponse res, @RequestParam Map paramMap, Criteria cri, @PathVariable(value="siteIdx") String siteIdx, @PathVariable(value="siteMenuIdx") Integer siteMenuIdx ){