Index: .idea/libraries/Maven__org_apache_struts_struts2_core_2_3_34.xml
===================================================================
diff -u
--- .idea/libraries/Maven__org_apache_struts_struts2_core_2_3_34.xml (revision 0)
+++ .idea/libraries/Maven__org_apache_struts_struts2_core_2_3_34.xml (revision 1e73c7a1c1afa311228cf65bd1dd2f8bb91b8f3d)
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: .idea/libraries/Maven__org_apache_struts_struts2_dojo_plugin_2_3_34.xml
===================================================================
diff -u
--- .idea/libraries/Maven__org_apache_struts_struts2_dojo_plugin_2_3_34.xml (revision 0)
+++ .idea/libraries/Maven__org_apache_struts_struts2_dojo_plugin_2_3_34.xml (revision 1e73c7a1c1afa311228cf65bd1dd2f8bb91b8f3d)
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: .idea/libraries/Maven__org_apache_struts_struts2_json_plugin_2_3_34.xml
===================================================================
diff -u
--- .idea/libraries/Maven__org_apache_struts_struts2_json_plugin_2_3_34.xml (revision 0)
+++ .idea/libraries/Maven__org_apache_struts_struts2_json_plugin_2_3_34.xml (revision 1e73c7a1c1afa311228cf65bd1dd2f8bb91b8f3d)
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: .idea/libraries/Maven__org_apache_struts_struts2_spring_plugin_2_3_34.xml
===================================================================
diff -u
--- .idea/libraries/Maven__org_apache_struts_struts2_spring_plugin_2_3_34.xml (revision 0)
+++ .idea/libraries/Maven__org_apache_struts_struts2_spring_plugin_2_3_34.xml (revision 1e73c7a1c1afa311228cf65bd1dd2f8bb91b8f3d)
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: .idea/libraries/Maven__org_apache_struts_xwork_xwork_core_2_3_34.xml
===================================================================
diff -u
--- .idea/libraries/Maven__org_apache_struts_xwork_xwork_core_2_3_34.xml (revision 0)
+++ .idea/libraries/Maven__org_apache_struts_xwork_xwork_core_2_3_34.xml (revision 1e73c7a1c1afa311228cf65bd1dd2f8bb91b8f3d)
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AnonymousMenuController.java
===================================================================
diff -u -r3ecfb5fa21aa552fa91471b7813eb58dc847c6ac -r1e73c7a1c1afa311228cf65bd1dd2f8bb91b8f3d
--- standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AnonymousMenuController.java (.../AnonymousMenuController.java) (revision 3ecfb5fa21aa552fa91471b7813eb58dc847c6ac)
+++ standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AnonymousMenuController.java (.../AnonymousMenuController.java) (revision 1e73c7a1c1afa311228cf65bd1dd2f8bb91b8f3d)
@@ -4,6 +4,7 @@
import com.google.common.collect.Maps;
import egovframework.api.rivalWar.aggregateResult.vo.AggregateResultDTO;
import egovframework.api.rivalWar.compareInfo.vo.CompareInfoDTO;
+import egovframework.api.rivalWar.compareSpec.vo.CompareSpecDTO;
import egovframework.api.rivalWar.menu.service.MenuService;
import egovframework.api.rivalWar.menu.vo.MenuDTO;
import egovframework.com.cmm.annotation.IncludedInfo;
@@ -190,6 +191,26 @@
}
@ResponseBody
+ @RequestMapping(value = "/getRootCompareSpec.do", method = RequestMethod.GET)
+ public ModelAndView getRootCompareSpec(MenuDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request)
+ throws Exception {
+
+ jsTreeHibernateDTO.setWhere("c_parentid", new Long(3));
+ List list = menuService.getChildNode(jsTreeHibernateDTO);
+ if(list.size() > 0){
+ MenuDTO tempMenuDTO = list.get(0);
+ CompareSpecDTO resultDTO = tempMenuDTO.getCompareSpecDTO();
+ ModelAndView modelAndView = new ModelAndView("jsonView");
+ modelAndView.addObject("result", resultDTO);
+ return modelAndView;
+ }else{
+ ModelAndView modelAndView = new ModelAndView("jsonView");
+ modelAndView.addObject("result", "none exist childnode");
+ return modelAndView;
+ }
+ }
+
+ @ResponseBody
@RequestMapping(value = "/getClassifiedMenu.do", method = RequestMethod.GET)
public ModelAndView getClassifiedMenu(MenuDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request)
throws Exception {
Index: standard/project/web/src/main/java/egovframework/api/rivalWar/menu/vo/MenuDTO.java
===================================================================
diff -u -r7e22b1924690824a27bb65043fd111a7861c35d3 -r1e73c7a1c1afa311228cf65bd1dd2f8bb91b8f3d
--- standard/project/web/src/main/java/egovframework/api/rivalWar/menu/vo/MenuDTO.java (.../MenuDTO.java) (revision 7e22b1924690824a27bb65043fd111a7861c35d3)
+++ standard/project/web/src/main/java/egovframework/api/rivalWar/menu/vo/MenuDTO.java (.../MenuDTO.java) (revision 1e73c7a1c1afa311228cf65bd1dd2f8bb91b8f3d)
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import egovframework.api.rivalWar.aggregateResult.vo.AggregateResultDTO;
import egovframework.api.rivalWar.compareInfo.vo.CompareInfoDTO;
+import egovframework.api.rivalWar.compareSpec.vo.CompareSpecDTO;
import egovframework.com.ext.jstree.springHibernate.core.vo.JsTreeHibernateSearchDTO;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.*;
@@ -107,4 +108,17 @@
public void setCompareInfoDTO(CompareInfoDTO compareInfoDTO) {
this.compareInfoDTO = compareInfoDTO;
}
+
+ private CompareSpecDTO compareSpecDTO;
+
+ @JsonIgnore
+ @OneToOne(cascade = CascadeType.ALL)
+ @JoinColumn(name = "COMPARE_SPEC_ID")
+ public CompareSpecDTO getCompareSpecDTO() {
+ return compareSpecDTO;
+ }
+
+ public void setCompareSpecDTO(CompareSpecDTO compareSpecDTO) {
+ this.compareSpecDTO = compareSpecDTO;
+ }
}