From 7bcb0ee0f1c19d9aace280a565d1f2447aadc22a Mon Sep 17 00:00:00 2001 From: JIWOO Date: Mon, 23 Sep 2024 11:07:25 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20SeedCriteria?= =?UTF-8?q?=20>=20Criteria=20=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD(SeedC?= =?UTF-8?q?riteria=20=EC=82=AC=EC=9A=A9=20=20=EC=8B=9C=20ajax=20=EC=98=A4?= =?UTF-8?q?=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 ){