Index: .idea/sonarIssues.xml =================================================================== diff -u -ra519d8785f296ca88790a4b8450812ef80e272c9 -r17e125daa69136e50a0fdccae40a7b94c11ac91b --- .idea/sonarIssues.xml (.../sonarIssues.xml) (revision a519d8785f296ca88790a4b8450812ef80e272c9) +++ .idea/sonarIssues.xml (.../sonarIssues.xml) (revision 17e125daa69136e50a0fdccae40a7b94c11ac91b) @@ -1643,6 +1643,11 @@ + + + + + Index: standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AdminMenuController.java =================================================================== diff -u -r5e54e4a8a045bc7c4f776107d136d989414b84e6 -r17e125daa69136e50a0fdccae40a7b94c11ac91b --- standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AdminMenuController.java (.../AdminMenuController.java) (revision 5e54e4a8a045bc7c4f776107d136d989414b84e6) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AdminMenuController.java (.../AdminMenuController.java) (revision 17e125daa69136e50a0fdccae40a7b94c11ac91b) @@ -41,14 +41,14 @@ * @throws InstantiationException */ @ResponseBody - @RequestMapping(value = "/addMenu.do", method = RequestMethod.POST) - public ModelAndView addMenu(@Validated(value = AddNode.class) MenuDTO jsTreeHibernateDTO, + @RequestMapping(value = "/addNode.do", method = RequestMethod.POST) + public ModelAndView addNode(@Validated(value = AddNode.class) MenuDTO jsTreeHibernateDTO, BindingResult bindingResult, ModelMap model) throws Exception { if (bindingResult.hasErrors()) throw new RuntimeException(); ModelAndView modelAndView = new ModelAndView("jsonView"); - modelAndView.addObject("result", menuService.addMenu(jsTreeHibernateDTO)); + modelAndView.addObject("result", menuService.addNode(jsTreeHibernateDTO)); return modelAndView; } @@ -68,7 +68,7 @@ if (bindingResult.hasErrors()) throw new RuntimeException(); - jsTreeHibernateDTO.setStatus(menuService.removeMenu(jsTreeHibernateDTO)); + jsTreeHibernateDTO.setStatus(menuService.removeNode(jsTreeHibernateDTO)); setJsonDefaultSetting(jsTreeHibernateDTO); ModelAndView modelAndView = new ModelAndView("jsonView"); @@ -96,7 +96,7 @@ * @throws JsonProcessingException */ @ResponseBody - @RequestMapping(value = "/alterMenu.do", method = RequestMethod.POST) + @RequestMapping(value = "/alterNode.do", method = RequestMethod.POST) public ModelAndView alterNode(@Validated(value = AlterNode.class) MenuDTO jsTreeHibernateDTO, BindingResult bindingResult, ModelMap model) throws Exception { if (bindingResult.hasErrors()){ @@ -105,7 +105,7 @@ jsTreeHibernateDTO.setC_title(Util_TitleChecker.StringReplace(jsTreeHibernateDTO.getC_title())); - jsTreeHibernateDTO.setStatus(menuService.alterMenu(jsTreeHibernateDTO)); + jsTreeHibernateDTO.setStatus(menuService.alterNode(jsTreeHibernateDTO)); setJsonDefaultSetting(jsTreeHibernateDTO); ModelAndView modelAndView = new ModelAndView("jsonView"); @@ -123,13 +123,13 @@ * @throws JsonProcessingException */ @ResponseBody - @RequestMapping(value = "/alterMenuType.do", method = RequestMethod.POST) + @RequestMapping(value = "/alterNodeType.do", method = RequestMethod.POST) public ModelAndView alterNodeType(@Validated(value = AlterNodeType.class) MenuDTO jsTreeHibernateDTO, BindingResult bindingResult, ModelMap model) throws Exception { if (bindingResult.hasErrors()) throw new RuntimeException(); - menuService.alterMenuType(jsTreeHibernateDTO); + menuService.alterNodeType(jsTreeHibernateDTO); setJsonDefaultSetting(jsTreeHibernateDTO); ModelAndView modelAndView = new ModelAndView("jsonView"); modelAndView.addObject("result", jsTreeHibernateDTO); @@ -149,13 +149,13 @@ * @throws InstantiationException */ @ResponseBody - @RequestMapping(value = "/moveMenu.do", method = RequestMethod.POST) + @RequestMapping(value = "/moveNode.do", method = RequestMethod.POST) public ModelAndView moveNode(@Validated(value = MoveNode.class) MenuDTO jsTreeHibernateDTO, BindingResult bindingResult, ModelMap model, HttpServletRequest request) throws Exception { if (bindingResult.hasErrors()) throw new RuntimeException(); - menuService.moveMenu(jsTreeHibernateDTO, request); + menuService.moveNode(jsTreeHibernateDTO, request); setJsonDefaultSetting(jsTreeHibernateDTO); ModelAndView modelAndView = new ModelAndView("jsonView"); @@ -164,7 +164,7 @@ } @ResponseBody - @RequestMapping(value = "/analyzeMenu.do", method = RequestMethod.GET) + @RequestMapping(value = "/analyzeNode.do", method = RequestMethod.GET) public ModelAndView getChildNode(ModelMap model) { model.addAttribute("analyzeResult", ""); Index: standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AnonymousMenuController.java =================================================================== diff -u -ra519d8785f296ca88790a4b8450812ef80e272c9 -r17e125daa69136e50a0fdccae40a7b94c11ac91b --- standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AnonymousMenuController.java (.../AnonymousMenuController.java) (revision a519d8785f296ca88790a4b8450812ef80e272c9) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AnonymousMenuController.java (.../AnonymousMenuController.java) (revision 17e125daa69136e50a0fdccae40a7b94c11ac91b) @@ -47,7 +47,7 @@ * @throws JsonProcessingException */ @ResponseBody - @RequestMapping(value = "/searchMenu.do", method = RequestMethod.GET) + @RequestMapping(value = "/searchNode.do", method = RequestMethod.GET) public ModelAndView searchNode(MenuDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request) throws Exception { @@ -59,14 +59,14 @@ jsTreeHibernateDTO.setWhereLike("c_title", parser.get("parser")); ModelAndView modelAndView = new ModelAndView("jsonView"); - modelAndView.addObject("result", menuService.searchMenu(jsTreeHibernateDTO)); + modelAndView.addObject("result", menuService.searchNode(jsTreeHibernateDTO)); return modelAndView; } @ResponseBody - @RequestMapping(value = "/getPaginatedChildMenu.do", method = RequestMethod.GET) - public ModelAndView getPaginatedChildMenu(MenuDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request) + @RequestMapping(value = "/getPaginatedChildNode.do", method = RequestMethod.GET) + public ModelAndView getPaginatedChildNode(MenuDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request) throws Exception { if (jsTreeHibernateDTO.getC_id() <= 0 || jsTreeHibernateDTO.getPageIndex() <= 0 @@ -75,7 +75,7 @@ } jsTreeHibernateDTO.setWhere("c_parentid", jsTreeHibernateDTO.getC_id()); - List list = menuService.getPaginatedChildMenu(jsTreeHibernateDTO); + List list = menuService.getPaginatedChildNode(jsTreeHibernateDTO); jsTreeHibernateDTO.getPaginationInfo().setTotalRecordCount(list.size()); ModelAndView modelAndView = new ModelAndView("jsonView"); @@ -87,8 +87,8 @@ } @ResponseBody - @RequestMapping(value = "/getMenu.do", method = RequestMethod.GET) - public ModelAndView getMenu(MenuDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request) + @RequestMapping(value = "/getNode.do", method = RequestMethod.GET) + public ModelAndView getNode(MenuDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request) throws Exception { ParameterParser parser = new ParameterParser(request); @@ -97,16 +97,16 @@ throw new RuntimeException(); } - MenuDTO menuDTO = menuService.getMenu(jsTreeHibernateDTO); + MenuDTO menuDTO = menuService.getNode(jsTreeHibernateDTO); ModelAndView modelAndView = new ModelAndView("jsonView"); modelAndView.addObject("result", menuDTO); return modelAndView; } @ResponseBody - @RequestMapping(value = "/getChildMenu.do", method = RequestMethod.GET) - public ModelAndView getChildMenu(MenuDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request) throws Exception { + @RequestMapping(value = "/getChildNode.do", method = RequestMethod.GET) + public ModelAndView getChildNode(MenuDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request) throws Exception { ParameterParser parser = new ParameterParser(request); @@ -115,7 +115,7 @@ } jsTreeHibernateDTO.setWhere("c_parentid", new Long(parser.get("c_id"))); - List list = menuService.getChildMenu(jsTreeHibernateDTO); + List list = menuService.getChildNode(jsTreeHibernateDTO); ModelAndView modelAndView = new ModelAndView("jsonView"); modelAndView.addObject("result", list); @@ -124,11 +124,11 @@ @ResponseBody @RequestMapping(value = "/getRootMenuCategories.do", method = RequestMethod.GET) - public ModelAndView getRootMenuCategories(MenuDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request) + public ModelAndView getRootNodeCategories(MenuDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request) throws Exception { jsTreeHibernateDTO.setWhere("c_parentid", new Long(2)); - List list = menuService.getChildMenu(jsTreeHibernateDTO); + List list = menuService.getChildNode(jsTreeHibernateDTO); ModelAndView modelAndView = new ModelAndView("jsonView"); modelAndView.addObject("result", list); @@ -141,7 +141,7 @@ throws Exception { jsTreeHibernateDTO.setWhere("c_parentid", new Long(3)); - List list = menuService.getChildMenu(jsTreeHibernateDTO); + List list = menuService.getChildNode(jsTreeHibernateDTO); ModelAndView modelAndView = new ModelAndView("jsonView"); modelAndView.addObject("result", list); @@ -154,7 +154,7 @@ throws Exception { jsTreeHibernateDTO.setWhere("c_parentid", new Long(4)); - List list = menuService.getChildMenu(jsTreeHibernateDTO); + List list = menuService.getChildNode(jsTreeHibernateDTO); ModelAndView modelAndView = new ModelAndView("jsonView"); modelAndView.addObject("result", list); Index: standard/project/web/src/main/java/egovframework/api/rivalWar/menu/service/MenuService.java =================================================================== diff -u -r395c2562d2dfd7900c4e263f8ddb5938785405ab -r17e125daa69136e50a0fdccae40a7b94c11ac91b --- standard/project/web/src/main/java/egovframework/api/rivalWar/menu/service/MenuService.java (.../MenuService.java) (revision 395c2562d2dfd7900c4e263f8ddb5938785405ab) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/menu/service/MenuService.java (.../MenuService.java) (revision 17e125daa69136e50a0fdccae40a7b94c11ac91b) @@ -7,22 +7,22 @@ public interface MenuService { - public T getMenu(T jsTreeHibernateDTO) throws Exception; + public T getNode(T jsTreeHibernateDTO) throws Exception; - public List getChildMenu(T jsTreeHibernateDTO) throws Exception; + public List getChildNode(T jsTreeHibernateDTO) throws Exception; - public List getPaginatedChildMenu(T jsTreeHibernateDTO) throws Exception; + public List getPaginatedChildNode(T jsTreeHibernateDTO) throws Exception; - public List searchMenu(T jsTreeHibernateDTO) throws Exception; + public List searchNode(T jsTreeHibernateDTO) throws Exception; - public T addMenu(T jsTreeHibernateDTO) throws Exception; + public T addNode(T jsTreeHibernateDTO) throws Exception; - public int removeMenu(T jsTreeHibernateDTO) throws Exception; + public int removeNode(T jsTreeHibernateDTO) throws Exception; - public int alterMenu(T jsTreeHibernateDTO) throws Exception; + public int alterNode(T jsTreeHibernateDTO) throws Exception; - public int alterMenuType(T jsTreeHibernateDTO) throws Exception; + public int alterNodeType(T jsTreeHibernateDTO) throws Exception; - public T moveMenu(T jsTreeHibernateDTO, HttpServletRequest request) throws Exception; + public T moveNode(T jsTreeHibernateDTO, HttpServletRequest request) throws Exception; } Index: standard/project/web/src/main/java/egovframework/api/rivalWar/menu/service/MenuServiceImpl.java =================================================================== diff -u -r395c2562d2dfd7900c4e263f8ddb5938785405ab -r17e125daa69136e50a0fdccae40a7b94c11ac91b --- standard/project/web/src/main/java/egovframework/api/rivalWar/menu/service/MenuServiceImpl.java (.../MenuServiceImpl.java) (revision 395c2562d2dfd7900c4e263f8ddb5938785405ab) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/menu/service/MenuServiceImpl.java (.../MenuServiceImpl.java) (revision 17e125daa69136e50a0fdccae40a7b94c11ac91b) @@ -15,47 +15,47 @@ private JsTreeHibernateService jsTreeHibernateService; @Override - public T getMenu(T jsTreeHibernateDTO) throws Exception { + public T getNode(T jsTreeHibernateDTO) throws Exception { return jsTreeHibernateService.getNode(jsTreeHibernateDTO); } @Override - public List getChildMenu(T jsTreeHibernateDTO) throws Exception { + public List getChildNode(T jsTreeHibernateDTO) throws Exception { return jsTreeHibernateService.getChildNode(jsTreeHibernateDTO); } @Override - public List getPaginatedChildMenu(T jsTreeHibernateDTO) throws Exception { + public List getPaginatedChildNode(T jsTreeHibernateDTO) throws Exception { return jsTreeHibernateService.getPaginatedChildNode(jsTreeHibernateDTO); } @Override - public List searchMenu(T jsTreeHibernateDTO) throws Exception { + public List searchNode(T jsTreeHibernateDTO) throws Exception { return jsTreeHibernateService.searchNode(jsTreeHibernateDTO); } @Override - public T addMenu(T jsTreeHibernateDTO) throws Exception { + public T addNode(T jsTreeHibernateDTO) throws Exception { return jsTreeHibernateService.addNode(jsTreeHibernateDTO); } @Override - public int removeMenu(T jsTreeHibernateDTO) throws Exception { + public int removeNode(T jsTreeHibernateDTO) throws Exception { return jsTreeHibernateService.removeNode(jsTreeHibernateDTO); } @Override - public int alterMenu(T jsTreeHibernateDTO) throws Exception { + public int alterNode(T jsTreeHibernateDTO) throws Exception { return jsTreeHibernateService.alterNode(jsTreeHibernateDTO); } @Override - public int alterMenuType(T jsTreeHibernateDTO) throws Exception { + public int alterNodeType(T jsTreeHibernateDTO) throws Exception { return jsTreeHibernateService.alterNodeType(jsTreeHibernateDTO); } @Override - public T moveMenu(T jsTreeHibernateDTO, HttpServletRequest request) + public T moveNode(T jsTreeHibernateDTO, HttpServletRequest request) throws Exception { return jsTreeHibernateService.moveNode(jsTreeHibernateDTO, request); } Index: standard/project/web/src/main/java/egovframework/api/rivalWar/menu/vo/MenuDTO.java =================================================================== diff -u -r8cab9e7cc85dd66414b4ff23410a53edb8a93bea -r17e125daa69136e50a0fdccae40a7b94c11ac91b --- standard/project/web/src/main/java/egovframework/api/rivalWar/menu/vo/MenuDTO.java (.../MenuDTO.java) (revision 8cab9e7cc85dd66414b4ff23410a53edb8a93bea) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/menu/vo/MenuDTO.java (.../MenuDTO.java) (revision 17e125daa69136e50a0fdccae40a7b94c11ac91b) @@ -1,5 +1,6 @@ package egovframework.api.rivalWar.menu.vo; +import egovframework.api.rivalWar.aggregateResult.vo.AggregateResultDTO; import egovframework.com.ext.jstree.springHibernate.core.vo.JsTreeHibernateSearchDTO; import org.hibernate.annotations.Cache; import org.hibernate.annotations.*; @@ -78,4 +79,9 @@ } } + @MapsId + @OneToOne + @JoinColumn(name = "c_id") + AggregateResultDTO aggregateResultDTO; + } Index: standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/api/rivalWar/menu/JsTreeView.jsp =================================================================== diff -u -r23d3d53f9cdbbce89052b18d5fce8c076b9c02f7 -r17e125daa69136e50a0fdccae40a7b94c11ac91b --- standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/api/rivalWar/menu/JsTreeView.jsp (.../JsTreeView.jsp) (revision 23d3d53f9cdbbce89052b18d5fce8c076b9c02f7) +++ standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/api/rivalWar/menu/JsTreeView.jsp (.../JsTreeView.jsp) (revision 17e125daa69136e50a0fdccae40a7b94c11ac91b) @@ -413,13 +413,13 @@ }); + getChildNode="${pageContext.request.contextPath}/api/rivalWar/menu/getChildNode.do" + searchNode="${pageContext.request.contextPath}/api/rivalWar/menu/searchNode.do" + addNode="${pageContext.request.contextPath}/api/rivalWar/ROLE_ADMIN/menu/addNode.do" + removeNode="${pageContext.request.contextPath}/api/rivalWar/ROLE_ADMIN/menu/removeNode.do" + alterNode="${pageContext.request.contextPath}/api/rivalWar/ROLE_ADMIN/menu/alterNode.do" + alterNodeType="${pageContext.request.contextPath}/api/rivalWar/ROLE_ADMIN/menu/alterNodeType.do" + moveNode="${pageContext.request.contextPath}/api/rivalWar/ROLE_ADMIN/menu/moveNode.do">