Index: .idea/sonarIssues.xml
===================================================================
diff -u -r6b8c4d7b039335012a2a19df87003435e1255391 -r848d6db4015a6e1d88a37dffdc8f6fc1bf9f0474
--- .idea/sonarIssues.xml (.../sonarIssues.xml) (revision 6b8c4d7b039335012a2a19df87003435e1255391)
+++ .idea/sonarIssues.xml (.../sonarIssues.xml) (revision 848d6db4015a6e1d88a37dffdc8f6fc1bf9f0474)
@@ -938,6 +938,16 @@
+
+
+
+
+
+
+
+
+
+
Index: standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/service/AggregateResultService.java
===================================================================
diff -u -rb90e69c1e21752ef73797dae3cb14b588123c07e -r848d6db4015a6e1d88a37dffdc8f6fc1bf9f0474
--- standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/service/AggregateResultService.java (.../AggregateResultService.java) (revision b90e69c1e21752ef73797dae3cb14b588123c07e)
+++ standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/service/AggregateResultService.java (.../AggregateResultService.java) (revision 848d6db4015a6e1d88a37dffdc8f6fc1bf9f0474)
@@ -1,7 +1,28 @@
package egovframework.api.rivalWar.aggregateResult.service;
-/**
- * Created by Administrator on 2017-08-29.
- */
-public class AggregateResultService {
+import egovframework.com.ext.jstree.springHibernate.core.vo.JsTreeHibernateSearchDTO;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+public interface AggregateResultService {
+
+ public T getAggregateResult(T jsTreeHibernateDTO) throws Exception;
+
+ public List getChildAggregateResult(T jsTreeHibernateDTO) throws Exception;
+
+ public List getPaginatedChildAggregateResult(T jsTreeHibernateDTO) throws Exception;
+
+ public List searchAggregateResult(T jsTreeHibernateDTO) throws Exception;
+
+ public T addAggregateResult(T jsTreeHibernateDTO) throws Exception;
+
+ public int removeAggregateResult(T jsTreeHibernateDTO) throws Exception;
+
+ public int alterAggregateResult(T jsTreeHibernateDTO) throws Exception;
+
+ public int alterAggregateResultType(T jsTreeHibernateDTO) throws Exception;
+
+ public T moveAggregateResult(T jsTreeHibernateDTO, HttpServletRequest request) throws Exception;
+
}
Index: standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/service/AggregateResultServiceImpl.java
===================================================================
diff -u -rb90e69c1e21752ef73797dae3cb14b588123c07e -r848d6db4015a6e1d88a37dffdc8f6fc1bf9f0474
--- standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/service/AggregateResultServiceImpl.java (.../AggregateResultServiceImpl.java) (revision b90e69c1e21752ef73797dae3cb14b588123c07e)
+++ standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/service/AggregateResultServiceImpl.java (.../AggregateResultServiceImpl.java) (revision 848d6db4015a6e1d88a37dffdc8f6fc1bf9f0474)
@@ -1,7 +1,66 @@
package egovframework.api.rivalWar.aggregateResult.service;
+import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateService;
+import egovframework.com.ext.jstree.springHibernate.core.vo.JsTreeHibernateSearchDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
/**
* Created by Administrator on 2017-08-29.
*/
-public class AggregateResultServiceImpl {
-}
+
+@Service("AggregateResultService")
+public class AggregateResultServiceImpl implements AggregateResultService {
+
+ @Autowired
+ private JsTreeHibernateService jsTreeHibernateService;
+
+ @Override
+ public T getAggregateResult(T jsTreeHibernateDTO) throws Exception {
+ return jsTreeHibernateService.getNode(jsTreeHibernateDTO);
+ }
+
+ @Override
+ public List getChildAggregateResult(T jsTreeHibernateDTO) throws Exception {
+ return jsTreeHibernateService.getChildNode(jsTreeHibernateDTO);
+ }
+
+ @Override
+ public List getPaginatedChildAggregateResult(T jsTreeHibernateDTO) throws Exception {
+ return jsTreeHibernateService.getPaginatedChildNode(jsTreeHibernateDTO);
+ }
+
+ @Override
+ public List searchAggregateResult(T jsTreeHibernateDTO) throws Exception {
+ return jsTreeHibernateService.searchNode(jsTreeHibernateDTO);
+ }
+
+ @Override
+ public T addAggregateResult(T jsTreeHibernateDTO) throws Exception {
+ return jsTreeHibernateService.addNode(jsTreeHibernateDTO);
+ }
+
+ @Override
+ public int removeAggregateResult(T jsTreeHibernateDTO) throws Exception {
+ return jsTreeHibernateService.removeNode(jsTreeHibernateDTO);
+ }
+
+ @Override
+ public int alterAggregateResult(T jsTreeHibernateDTO) throws Exception {
+ return jsTreeHibernateService.alterNode(jsTreeHibernateDTO);
+ }
+
+ @Override
+ public int alterAggregateResultType(T jsTreeHibernateDTO) throws Exception {
+ return jsTreeHibernateService.alterNodeType(jsTreeHibernateDTO);
+ }
+
+ @Override
+ public T moveAggregateResult(T jsTreeHibernateDTO, HttpServletRequest request)
+ throws Exception {
+ return jsTreeHibernateService.moveNode(jsTreeHibernateDTO, request);
+ }
+}
\ No newline at end of file
Index: standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AdminMenuController.java
===================================================================
diff -u -r23d3d53f9cdbbce89052b18d5fce8c076b9c02f7 -r848d6db4015a6e1d88a37dffdc8f6fc1bf9f0474
--- standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AdminMenuController.java (.../AdminMenuController.java) (revision 23d3d53f9cdbbce89052b18d5fce8c076b9c02f7)
+++ standard/project/web/src/main/java/egovframework/api/rivalWar/menu/controller/AdminMenuController.java (.../AdminMenuController.java) (revision 848d6db4015a6e1d88a37dffdc8f6fc1bf9f0474)
@@ -1,20 +1,16 @@
package egovframework.api.rivalWar.menu.controller;
import com.fasterxml.jackson.core.JsonProcessingException;
-import com.google.common.collect.Maps;
import egovframework.api.rivalWar.menu.service.MenuService;
import egovframework.api.rivalWar.menu.vo.MenuDTO;
-import egovframework.com.cmm.annotation.IncludedInfo;
import egovframework.com.ext.jstree.springiBatis.core.util.Util_TitleChecker;
import egovframework.com.ext.jstree.springiBatis.core.validation.group.*;
import egovframework.com.ext.jstree.support.mvc.GenericAbstractController;
-import egovframework.com.ext.jstree.support.util.ParameterParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,8 +19,6 @@
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
@Controller
@RequestMapping(value = {"/api/rivalWar/ROLE_ADMIN/menu"})