Index: standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/controller/AdminAggregateResultController.java =================================================================== diff -u -rc47f6d48843ffd8b96b224999010942fdeca6798 -ra95579dfb9383b52665f1bcea22849513b27f4ef --- standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/controller/AdminAggregateResultController.java (.../AdminAggregateResultController.java) (revision c47f6d48843ffd8b96b224999010942fdeca6798) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/controller/AdminAggregateResultController.java (.../AdminAggregateResultController.java) (revision a95579dfb9383b52665f1bcea22849513b27f4ef) @@ -16,6 +16,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; @@ -117,6 +118,7 @@ return modelAndView; } + /** * 노드의 타입을 변경한다. * Index: standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/vo/AggregateResultDTO.java =================================================================== diff -u -r6eb8c9f10e9760f829ca900f780b209fe7080028 -ra95579dfb9383b52665f1bcea22849513b27f4ef --- standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/vo/AggregateResultDTO.java (.../AggregateResultDTO.java) (revision 6eb8c9f10e9760f829ca900f780b209fe7080028) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/vo/AggregateResultDTO.java (.../AggregateResultDTO.java) (revision a95579dfb9383b52665f1bcea22849513b27f4ef) @@ -428,49 +428,49 @@ public void setFieldFromNewInstance(T paramInstance) { if (paramInstance instanceof AggregateResultDTO) { - this.setCalTime(this.getCalTime()); + this.setCalTime(((AggregateResultDTO) paramInstance).getCalTime()); - this.setTopName(this.getTopName()); - this.setTopNumberOfAdvantages(this.getTopNumberOfAdvantages()); - this.setTopLikeCount(this.getTopLikeCount()); - this.setTopTotalRegisteredPosts(this.getTopTotalRegisteredPosts()); - this.setTopRegisteredHashTag(this.getTopRegisteredHashTag()); - this.setTopGraphPercent(this.getTopGraphPercent()); - this.setTopVersusScore(this.getTopVersusScore()); + this.setTopName(((AggregateResultDTO) paramInstance).getTopName()); + this.setTopNumberOfAdvantages(((AggregateResultDTO) paramInstance).getTopNumberOfAdvantages()); + this.setTopLikeCount(((AggregateResultDTO) paramInstance).getTopLikeCount()); + this.setTopTotalRegisteredPosts(((AggregateResultDTO) paramInstance).getTopTotalRegisteredPosts()); + this.setTopRegisteredHashTag(((AggregateResultDTO) paramInstance).getTopRegisteredHashTag()); + this.setTopGraphPercent(((AggregateResultDTO) paramInstance).getTopGraphPercent()); + this.setTopVersusScore(((AggregateResultDTO) paramInstance).getTopVersusScore()); - this.setMidName(this.getMidName()); - this.setMidNumberOfAdvantages(this.getMidNumberOfAdvantages()); - this.setMidLikeCount(this.getMidLikeCount()); - this.setMidTotalRegisteredPosts(this.getMidTotalRegisteredPosts()); - this.setMidRegisteredHashTag(this.getMidRegisteredHashTag()); - this.setMidGraphPercent(this.getMidGraphPercent()); - this.setMidVersusScore(this.getMidVersusScore()); + this.setMidName(((AggregateResultDTO) paramInstance).getMidName()); + this.setMidNumberOfAdvantages(((AggregateResultDTO) paramInstance).getMidNumberOfAdvantages()); + this.setMidLikeCount(((AggregateResultDTO) paramInstance).getMidLikeCount()); + this.setMidTotalRegisteredPosts(((AggregateResultDTO) paramInstance).getMidTotalRegisteredPosts()); + this.setMidRegisteredHashTag(((AggregateResultDTO) paramInstance).getMidRegisteredHashTag()); + this.setMidGraphPercent(((AggregateResultDTO) paramInstance).getMidGraphPercent()); + this.setMidVersusScore(((AggregateResultDTO) paramInstance).getMidVersusScore()); - this.setBotName(this.getBotName()); - this.setBotNumberOfAdvantages(this.getBotNumberOfAdvantages()); - this.setBotLikeCount(this.getBotLikeCount()); - this.setBotTotalRegisteredPosts(this.getBotTotalRegisteredPosts()); - this.setBotRegisteredHashTag(this.getBotRegisteredHashTag()); - this.setBotGraphPercent(this.getBotGraphPercent()); - this.setBotVersusScore(this.getBotVersusScore()); + this.setBotName(((AggregateResultDTO) paramInstance).getBotName()); + this.setBotNumberOfAdvantages(((AggregateResultDTO) paramInstance).getBotNumberOfAdvantages()); + this.setBotLikeCount(((AggregateResultDTO) paramInstance).getBotLikeCount()); + this.setBotTotalRegisteredPosts(((AggregateResultDTO) paramInstance).getBotTotalRegisteredPosts()); + this.setBotRegisteredHashTag(((AggregateResultDTO) paramInstance).getBotRegisteredHashTag()); + this.setBotGraphPercent(((AggregateResultDTO) paramInstance).getBotGraphPercent()); + this.setBotVersusScore(((AggregateResultDTO) paramInstance).getBotVersusScore()); - this.setTotalTraffic(this.getTotalTraffic()); - this.setUniqueVisit(this.getUniqueVisit()); - this.setRevisitCount(this.getRevisitCount()); - this.setPageView(this.getPageView()); + this.setTotalTraffic(((AggregateResultDTO) paramInstance).getTotalTraffic()); + this.setUniqueVisit(((AggregateResultDTO) paramInstance).getUniqueVisit()); + this.setRevisitCount(((AggregateResultDTO) paramInstance).getRevisitCount()); + this.setPageView(((AggregateResultDTO) paramInstance).getPageView()); - this.setTotalArticle(this.getTotalArticle()); - this.setTotalLikeCount(this.getTotalLikeCount()); - this.setTotalSpecCount(this.getTotalSpecCount()); - this.setTotalHashCount(this.getTotalHashCount()); + this.setTotalArticle(((AggregateResultDTO) paramInstance).getTotalArticle()); + this.setTotalLikeCount(((AggregateResultDTO) paramInstance).getTotalLikeCount()); + this.setTotalSpecCount(((AggregateResultDTO) paramInstance).getTotalSpecCount()); + this.setTotalHashCount(((AggregateResultDTO) paramInstance).getTotalHashCount()); - this.setStandardError(this.getStandardError()); - this.setEquilibriumAssumption(this.getEquilibriumAssumption()); - this.setProbability(this.getProbability()); - this.setLowerLimit(this.getLowerLimit()); - this.setHigherLimit(this.getHigherLimit()); + this.setStandardError(((AggregateResultDTO) paramInstance).getStandardError()); + this.setEquilibriumAssumption(((AggregateResultDTO) paramInstance).getEquilibriumAssumption()); + this.setProbability(((AggregateResultDTO) paramInstance).getProbability()); + this.setLowerLimit(((AggregateResultDTO) paramInstance).getLowerLimit()); + this.setHigherLimit(((AggregateResultDTO) paramInstance).getHigherLimit()); - this.setDistributionTResult(this.getDistributionTResult()); + this.setDistributionTResult(((AggregateResultDTO) paramInstance).getDistributionTResult()); } } } Index: standard/project/web/src/main/java/egovframework/api/rivalWar/menu/vo/MenuDTO.java =================================================================== diff -u -rc32b3ff9f3a5c8369c96c279a7670d7922675431 -ra95579dfb9383b52665f1bcea22849513b27f4ef --- standard/project/web/src/main/java/egovframework/api/rivalWar/menu/vo/MenuDTO.java (.../MenuDTO.java) (revision c32b3ff9f3a5c8369c96c279a7670d7922675431) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/menu/vo/MenuDTO.java (.../MenuDTO.java) (revision a95579dfb9383b52665f1bcea22849513b27f4ef) @@ -76,8 +76,8 @@ @Override public void setFieldFromNewInstance(T paramInstance) { if (paramInstance instanceof MenuDTO) { - this.setC_vote_start_date(this.getC_vote_start_date()); - this.setC_vote_end_date(this.getC_vote_end_date()); + this.setC_vote_start_date(((MenuDTO) paramInstance).getC_vote_start_date()); + this.setC_vote_end_date(((MenuDTO) paramInstance).getC_vote_end_date()); } } Index: standard/project/web/src/main/java/egovframework/com/ext/jstree/springHibernate/core/service/JsTreeHibernateServiceImpl.java =================================================================== diff -u -ra0c206993c202375dd04d37db3d17c843482684e -ra95579dfb9383b52665f1bcea22849513b27f4ef --- standard/project/web/src/main/java/egovframework/com/ext/jstree/springHibernate/core/service/JsTreeHibernateServiceImpl.java (.../JsTreeHibernateServiceImpl.java) (revision a0c206993c202375dd04d37db3d17c843482684e) +++ standard/project/web/src/main/java/egovframework/com/ext/jstree/springHibernate/core/service/JsTreeHibernateServiceImpl.java (.../JsTreeHibernateServiceImpl.java) (revision a95579dfb9383b52665f1bcea22849513b27f4ef) @@ -291,6 +291,7 @@ jsTreeHibernateDao.setClazz(jsTreeHibernateDTO.getClass()); T alterTargetNode = (T) jsTreeHibernateDao.getUnique(jsTreeHibernateDTO.getC_id()); alterTargetNode.setC_title(jsTreeHibernateDTO.getC_title()); + alterTargetNode.setFieldFromNewInstance(jsTreeHibernateDTO); jsTreeHibernateDao.update(alterTargetNode); return 1; } Index: standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/api/rivalWar/aggregateResult/JsTreeView.jsp =================================================================== diff -u -rc47f6d48843ffd8b96b224999010942fdeca6798 -ra95579dfb9383b52665f1bcea22849513b27f4ef --- standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/api/rivalWar/aggregateResult/JsTreeView.jsp (.../JsTreeView.jsp) (revision c47f6d48843ffd8b96b224999010942fdeca6798) +++ standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/api/rivalWar/aggregateResult/JsTreeView.jsp (.../JsTreeView.jsp) (revision a95579dfb9383b52665f1bcea22849513b27f4ef) @@ -446,9 +446,48 @@