Skip to content

Commit 4b150fa

Browse files
jstreejstree
committed
[BT] SP-490 #close #time 1h #comment jsTreeServiceFramework monitor function push
 [RV] +review SR @admin
1 parent cb3f0e3 commit 4b150fa

File tree

17 files changed

+259
-1040
lines changed

17 files changed

+259
-1040
lines changed

‎.idea/sonarIssues.xml‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎standard/project/web/src/main/java/egovframework/api/rivalWar/compareItem/controller/AnonymousCompareItemController.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
import com.google.common.collect.Maps;
55
import egovframework.api.rivalWar.compareItem.service.CompareItemService;
66
import egovframework.api.rivalWar.compareItem.vo.CompareItemDTO;
7+
import egovframework.api.rivalWar.menu.vo.MenuDTO;
78
import egovframework.com.cmm.annotation.IncludedInfo;
89
import egovframework.com.ext.jstree.support.mvc.GenericAbstractController;
910
import egovframework.com.ext.jstree.support.util.ParameterParser;
11+
import org.hibernate.criterion.Order;
1012
import org.slf4j.Logger;
1113
import org.slf4j.LoggerFactory;
1214
import org.springframework.beans.factory.annotation.Autowired;
@@ -155,4 +157,17 @@ public ModelAndView getChildNode(CompareItemDTO jsTreeHibernateDTO, ModelMap mod
155157
modelAndView.addObject("result", list);
156158
return modelAndView;
157159
}
160+
161+
@ResponseBody
162+
@RequestMapping(value = "/getMonitor.do", method = RequestMethod.GET)
163+
public ModelAndView getMonitor(CompareItemDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request)
164+
throws Exception {
165+
166+
jsTreeHibernateDTO.setOrder(Order.asc("c_id"));
167+
List<CompareItemDTO> list = compareItemService.getChildNode(jsTreeHibernateDTO);
168+
169+
ModelAndView modelAndView = new ModelAndView("jsonView");
170+
modelAndView.addObject("result", list);
171+
return modelAndView;
172+
}
158173
}

‎standard/project/web/src/main/java/egovframework/api/rivalWar/directChat/controller/AnonymousDirectChatController.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
44
import com.google.common.collect.Maps;
5+
import egovframework.api.rivalWar.compareItem.vo.CompareItemDTO;
56
import egovframework.api.rivalWar.directChat.service.DirectChatService;
67
import egovframework.api.rivalWar.directChat.vo.DirectChatDTO;
78
import egovframework.com.cmm.annotation.IncludedInfo;
89
import egovframework.com.ext.jstree.support.mvc.GenericAbstractController;
910
import egovframework.com.ext.jstree.support.util.ParameterParser;
11+
import org.hibernate.criterion.Order;
1012
import org.slf4j.Logger;
1113
import org.slf4j.LoggerFactory;
1214
import org.springframework.beans.factory.annotation.Autowired;
@@ -151,4 +153,17 @@ public ModelAndView getChildNode(DirectChatDTO jsTreeHibernateDTO, ModelMap mode
151153
modelAndView.addObject("result", list);
152154
return modelAndView;
153155
}
156+
157+
@ResponseBody
158+
@RequestMapping(value = "/getMonitor.do", method = RequestMethod.GET)
159+
public ModelAndView getMonitor(DirectChatDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request)
160+
throws Exception {
161+
162+
jsTreeHibernateDTO.setOrder(Order.asc("c_id"));
163+
List<DirectChatDTO> list = directChatService.getChildNode(jsTreeHibernateDTO);
164+
165+
ModelAndView modelAndView = new ModelAndView("jsonView");
166+
modelAndView.addObject("result", list);
167+
return modelAndView;
168+
}
154169
}

‎standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AnonymousMenuController.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
import egovframework.api.rivalWar.menu.service.MenuService;
99
import egovframework.api.rivalWar.menu.vo.MenuDTO;
1010
import egovframework.com.cmm.annotation.IncludedInfo;
11+
import egovframework.com.ext.jstree.springHibernate.core.vo.JsTreeHibernateDTO;
1112
import egovframework.com.ext.jstree.support.mvc.GenericAbstractController;
1213
import egovframework.com.ext.jstree.support.util.ParameterParser;
14+
import org.hibernate.criterion.Order;
1315
import org.slf4j.Logger;
1416
import org.slf4j.LoggerFactory;
1517
import org.springframework.beans.factory.annotation.Autowired;
@@ -124,6 +126,19 @@ public ModelAndView getChildNode(MenuDTO jsTreeHibernateDTO, ModelMap model, Htt
124126
return modelAndView;
125127
}
126128

129+
@ResponseBody
130+
@RequestMapping(value = "/getMonitor.do", method = RequestMethod.GET)
131+
public ModelAndView getMonitor(MenuDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request)
132+
throws Exception {
133+
134+
jsTreeHibernateDTO.setOrder(Order.asc("c_id"));
135+
List<MenuDTO> list = menuService.getChildNode(jsTreeHibernateDTO);
136+
137+
ModelAndView modelAndView = new ModelAndView("jsonView");
138+
modelAndView.addObject("result", list);
139+
return modelAndView;
140+
}
141+
127142
@ResponseBody
128143
@RequestMapping(value = "/getRootMenuCategories.do", method = RequestMethod.GET)
129144
public ModelAndView getRootNodeCategories(MenuDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request)

‎standard/project/web/src/main/java/egovframework/api/rivalWar/specHashTag/controller/AnonymousSpecHashTagController.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
44
import com.google.common.collect.Maps;
5+
import egovframework.api.rivalWar.menu.vo.MenuDTO;
56
import egovframework.api.rivalWar.specHashTag.service.SpecHashTagService;
67
import egovframework.api.rivalWar.specHashTag.vo.SpecHashTagDTO;
78
import egovframework.com.cmm.annotation.IncludedInfo;
89
import egovframework.com.ext.jstree.support.mvc.GenericAbstractController;
910
import egovframework.com.ext.jstree.support.util.ParameterParser;
11+
import org.hibernate.criterion.Order;
1012
import org.slf4j.Logger;
1113
import org.slf4j.LoggerFactory;
1214
import org.springframework.beans.factory.annotation.Autowired;
@@ -152,4 +154,17 @@ public ModelAndView getChildNode(SpecHashTagDTO jsTreeHibernateDTO, ModelMap mod
152154
modelAndView.addObject("result", list);
153155
return modelAndView;
154156
}
157+
158+
@ResponseBody
159+
@RequestMapping(value = "/getMonitor.do", method = RequestMethod.GET)
160+
public ModelAndView getMonitor(SpecHashTagDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request)
161+
throws Exception {
162+
163+
jsTreeHibernateDTO.setOrder(Order.asc("c_id"));
164+
List<SpecHashTagDTO> list = specHashTagService.getChildNode(jsTreeHibernateDTO);
165+
166+
ModelAndView modelAndView = new ModelAndView("jsonView");
167+
modelAndView.addObject("result", list);
168+
return modelAndView;
169+
}
155170
}

‎standard/project/web/src/main/java/egovframework/api/rivalWar/userSelectedItem/controller/AnonymousUserSelectedItemController.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
44
import com.google.common.collect.Maps;
5+
import egovframework.api.rivalWar.specHashTag.vo.SpecHashTagDTO;
56
import egovframework.api.rivalWar.userSelectedItem.service.UserSelectedItemService;
67
import egovframework.api.rivalWar.userSelectedItem.vo.UserSelectedItemDTO;
78
import egovframework.com.cmm.annotation.IncludedInfo;
89
import egovframework.com.ext.jstree.support.mvc.GenericAbstractController;
910
import egovframework.com.ext.jstree.support.util.ParameterParser;
11+
import org.hibernate.criterion.Order;
1012
import org.slf4j.Logger;
1113
import org.slf4j.LoggerFactory;
1214
import org.springframework.beans.factory.annotation.Autowired;
@@ -152,4 +154,17 @@ public ModelAndView getChildNode(UserSelectedItemDTO jsTreeHibernateDTO, ModelMa
152154
modelAndView.addObject("result", list);
153155
return modelAndView;
154156
}
157+
158+
@ResponseBody
159+
@RequestMapping(value = "/getMonitor.do", method = RequestMethod.GET)
160+
public ModelAndView getMonitor(UserSelectedItemDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request)
161+
throws Exception {
162+
163+
jsTreeHibernateDTO.setOrder(Order.asc("c_id"));
164+
List<UserSelectedItemDTO> list = userSelectedItemService.getChildNode(jsTreeHibernateDTO);
165+
166+
ModelAndView modelAndView = new ModelAndView("jsonView");
167+
modelAndView.addObject("result", list);
168+
return modelAndView;
169+
}
155170
}

‎standard/project/web/src/main/java/egovframework/com/ext/jstree/springHibernate/core/controller/JsTreeHibernateController.java‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import javax.annotation.Resource;
77
import javax.servlet.http.HttpServletRequest;
88

9+
import org.hibernate.criterion.Order;
910
import org.springframework.beans.factory.annotation.Autowired;
1011
import org.springframework.beans.factory.annotation.Qualifier;
1112
import org.springframework.stereotype.Controller;
@@ -264,12 +265,25 @@ public ModelAndView moveNode(@Validated(value = MoveNode.class) JsTreeHibernateD
264265

265266
@ResponseBody
266267
@RequestMapping(value = "/analyzeNode.do", method = RequestMethod.GET)
267-
public ModelAndView getChildNode(ModelMap model) {
268+
public ModelAndView analyzeNode(ModelMap model) {
268269
model.addAttribute("analyzeResult", "");
269270

270271
ModelAndView modelAndView = new ModelAndView("jsonView");
271272
modelAndView.addObject("result", "ture");
272273
return modelAndView;
273274
}
274275

276+
@ResponseBody
277+
@RequestMapping(value = "/getMonitor.do", method = RequestMethod.GET)
278+
public ModelAndView getMonitor(JsTreeHibernateDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request)
279+
throws Exception {
280+
281+
jsTreeHibernateDTO.setOrder(Order.asc("c_id"));
282+
List<JsTreeHibernateDTO> list = jsTreeHibernateService.getChildNode(jsTreeHibernateDTO);
283+
284+
ModelAndView modelAndView = new ModelAndView("jsonView");
285+
modelAndView.addObject("result", list);
286+
return modelAndView;
287+
}
288+
275289
}

‎standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/api/rivalWar/aggregateResult/JsTreeView.jsp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,8 @@
678678
removeNode="${pageContext.request.contextPath}/api/rivalWar/ROLE_ADMIN/aggregateResult/removeNode.do"
679679
alterNode="${pageContext.request.contextPath}/api/rivalWar/ROLE_ADMIN/aggregateResult/alterNode.do"
680680
alterNodeType="${pageContext.request.contextPath}/api/rivalWar/ROLE_ADMIN/aggregateResult/alterNodeType.do"
681-
moveNode="${pageContext.request.contextPath}/api/rivalWar/ROLE_ADMIN/aggregateResult/moveNode.do"></customTags:jstree>
681+
moveNode="${pageContext.request.contextPath}/api/rivalWar/ROLE_ADMIN/aggregateResult/moveNode.do">
682+
</customTags:jstree>
682683
</div>
683684
</div>
684685
</div>

‎standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/api/rivalWar/compareItem/JsTreeView.jsp‎

Lines changed: 16 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -355,61 +355,29 @@
355355
<!-- JavaScript neccessary for the tree -->
356356
<script type="text/javascript">
357357
function jstreeDataTableReload() {
358-
var jstreeDataTable = $('#jstreeTable').dataTable({
358+
$('#jstreeTable').dataTable({
359359
"ajax": {
360-
"url": "${pageContext.request.contextPath}/rivalWar/api/compareItem/monitor/list.do",
361-
"dataSrc": "rows"
360+
"url": "${pageContext.request.contextPath}/api/rivalWar/compareItem/getMonitor.do",
361+
"dataSrc": ""
362362
},
363+
"destroy": true,
363364
"processing": true,
364365
"responsive": true,
365-
"columns": [{
366-
"data": "cell.0"
367-
}, {
368-
"data": "cell.1"
369-
}, {
370-
"data": "cell.2"
371-
}, {
372-
"data": "cell.3"
373-
}, {
374-
"data": "cell.4"
375-
}, {
376-
"data": "cell.5"
377-
}, {
378-
"data": "cell.6"
379-
}, {
380-
"data": "cell.7"
381-
}]
366+
"columns": [
367+
{ "data": "c_id" },
368+
{ "data": "c_parentid" },
369+
{ "data": "c_position" },
370+
{ "data": "c_left" },
371+
{ "data": "c_right" },
372+
{ "data": "c_level" },
373+
{ "data": "c_title" },
374+
{ "data": "c_type" }
375+
]
382376
});
383-
jstreeDataTable.api().ajax.reload();
384377
}
385378
386-
$(function () {
387-
388-
var jstreeDataTable = $('#jstreeTable').dataTable({
389-
"ajax": {
390-
"url": "${pageContext.request.contextPath}/rivalWar/api/compareItem/monitor/list.do",
391-
"dataSrc": "rows"
392-
},
393-
"processing": true,
394-
"responsive": true,
395-
"columns": [{
396-
"data": "cell.0"
397-
}, {
398-
"data": "cell.1"
399-
}, {
400-
"data": "cell.2"
401-
}, {
402-
"data": "cell.3"
403-
}, {
404-
"data": "cell.4"
405-
}, {
406-
"data": "cell.5"
407-
}, {
408-
"data": "cell.6"
409-
}, {
410-
"data": "cell.7"
411-
}]
412-
});
379+
$(function() {
380+
jstreeDataTableReload();
413381
});
414382
415383
function jsTreeClick(selectedNodeID) {

‎standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/api/rivalWar/directChat/JsTreeView.jsp‎

Lines changed: 30 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -326,70 +326,37 @@ table.dataTable.dtr-inline.collapsed tbody td:first-child:before,table.dataTable
326326

327327
<div id='alog' style="float: left; border: 1px solid gray; padding: 5px; height: 150px; margin-top: 15px; overflow: auto; width: 98%;">분석 결과</div>
328328

329-
<!-- JavaScript neccessary for the tree -->
330329
<script type="text/javascript">
331-
function jstreeDataTableReload() {
332-
var jstreeDataTable = $('#jstreeTable').dataTable({
333-
"ajax": {
334-
"url": "${pageContext.request.contextPath}/api/rivalWar/directChat/monitor/list.do",
335-
"dataSrc": "rows"
336-
},
337-
"processing": true,
338-
"responsive": true,
339-
"columns": [{
340-
"data": "cell.0"
341-
}, {
342-
"data": "cell.1"
343-
}, {
344-
"data": "cell.2"
345-
}, {
346-
"data": "cell.3"
347-
}, {
348-
"data": "cell.4"
349-
}, {
350-
"data": "cell.5"
351-
}, {
352-
"data": "cell.6"
353-
}, {
354-
"data": "cell.7"
355-
}]
356-
});
357-
jstreeDataTable.api().ajax.reload();
358-
}
359-
360-
$(function() {
361-
362-
var jstreeDataTable = $('#jstreeTable').dataTable({
363-
"ajax": {
364-
"url": "${pageContext.request.contextPath}/api/rivalWar/directChat/monitor/list.do",
365-
"dataSrc": "rows"
366-
},
367-
"processing": true,
368-
"responsive": true,
369-
"columns": [{
370-
"data": "cell.0"
371-
}, {
372-
"data": "cell.1"
373-
}, {
374-
"data": "cell.2"
375-
}, {
376-
"data": "cell.3"
377-
}, {
378-
"data": "cell.4"
379-
}, {
380-
"data": "cell.5"
381-
}, {
382-
"data": "cell.6"
383-
}, {
384-
"data": "cell.7"
385-
}]
386-
});
387-
});
388-
389-
function jsTreeClick(selectedNodeID) {
390-
console.log(selectedNodeID);
391-
}
392-
</script>
330+
function jstreeDataTableReload() {
331+
$('#jstreeTable').dataTable({
332+
"ajax": {
333+
"url": "${pageContext.request.contextPath}/api/rivalWar/directChat/getMonitor.do",
334+
"dataSrc": ""
335+
},
336+
"destroy": true,
337+
"processing": true,
338+
"responsive": true,
339+
"columns": [
340+
{ "data": "c_id" },
341+
{ "data": "c_parentid" },
342+
{ "data": "c_position" },
343+
{ "data": "c_left" },
344+
{ "data": "c_right" },
345+
{ "data": "c_level" },
346+
{ "data": "c_title" },
347+
{ "data": "c_type" }
348+
]
349+
});
350+
}
351+
352+
$(function() {
353+
jstreeDataTableReload();
354+
});
355+
356+
function jsTreeClick(selectedNodeID) {
357+
console.log(selectedNodeID);
358+
}
359+
</script>
393360
<customTags:jstree target="#demo"
394361
getChildNode="${pageContext.request.contextPath}/api/rivalWar/directChat/getChildNode.do"
395362
searchNode="${pageContext.request.contextPath}/api/rivalWar/directChat/searchNode.do"

0 commit comments

Comments
 (0)