Index: .idea/sonarIssues.xml =================================================================== diff -u -r9b9b8da01d85c0ddf56c2230d1312b99d8f29fce -r6eb8c9f10e9760f829ca900f780b209fe7080028 --- .idea/sonarIssues.xml (.../sonarIssues.xml) (revision 9b9b8da01d85c0ddf56c2230d1312b99d8f29fce) +++ .idea/sonarIssues.xml (.../sonarIssues.xml) (revision 6eb8c9f10e9760f829ca900f780b209fe7080028) @@ -1793,6 +1793,11 @@ + + + + + @@ -1838,6 +1843,11 @@ + + + + + Index: standard/project/web/script/ddl/oracle/egovframework/api/rivalWar/aggregateResult/AggregateResult_DDL_Oracle.sql =================================================================== diff -u -r9b9b8da01d85c0ddf56c2230d1312b99d8f29fce -r6eb8c9f10e9760f829ca900f780b209fe7080028 --- standard/project/web/script/ddl/oracle/egovframework/api/rivalWar/aggregateResult/AggregateResult_DDL_Oracle.sql (.../AggregateResult_DDL_Oracle.sql) (revision 9b9b8da01d85c0ddf56c2230d1312b99d8f29fce) +++ standard/project/web/script/ddl/oracle/egovframework/api/rivalWar/aggregateResult/AggregateResult_DDL_Oracle.sql (.../AggregateResult_DDL_Oracle.sql) (revision 6eb8c9f10e9760f829ca900f780b209fe7080028) @@ -44,27 +44,30 @@ C_TITLE VARCHAR2(4000 BYTE), C_TYPE VARCHAR2(4000 BYTE), + CAL_TIME VARCHAR2(4000 BYTE), + + TOP_NAME VARCHAR2(4000 BYTE), TOP_NUMBER_OF_ADVANTAGES NUMBER, TOP_LIKE_COUNT NUMBER, TOP_TOTAL_REGISTERED_POSTS NUMBER, TOP_REGISTERED_HASH_TAG NUMBER, + TOP_GRAPH_PERCENT NUMBER, + TOP_VERSUS_SCORE NUMBER, + MID_NAME VARCHAR2(4000 BYTE), MID_NUMBER_OF_ADVANTAGES NUMBER, MID_LIKE_COUNT NUMBER, MID_TOTAL_REGISTERED_POSTS NUMBER, MID_REGISTERED_HASH_TAG NUMBER, + MID_GRAPH_PERCENT NUMBER, + MID_VERSUS_SCORE NUMBER, + BOT_NAME VARCHAR2(4000 BYTE), BOT_NUMBER_OF_ADVANTAGES NUMBER, BOT_LIKE_COUNT NUMBER, BOT_TOTAL_REGISTERED_POSTS NUMBER, BOT_REGISTERED_HASH_TAG NUMBER, - - TOP_GRAPH_PERCENT NUMBER, - MID_GRAPH_PERCENT NUMBER, BOT_GRAPH_PERCENT NUMBER, - - TOP_VERSUS_SCORE NUMBER, - MID_VERSUS_SCORE NUMBER, BOT_VERSUS_SCORE NUMBER, TOTAL_TRAFFIC NUMBER, @@ -99,27 +102,30 @@ COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.C_TITLE IS '노드 명'; COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.C_TYPE IS '노드 타입'; +COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.CAL_TIME IS '누적 집계 시간'; + +COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.TOP_NAME IS '우위 이름'; COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.TOP_NUMBER_OF_ADVANTAGES IS '우위 스펙 개수'; COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.TOP_LIKE_COUNT IS '우위 좋아요 개수'; COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.TOP_TOTAL_REGISTERED_POSTS IS '우위 등록 글 개수'; COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.TOP_REGISTERED_HASH_TAG IS '우위 등록 해시태그 개수'; +COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.TOP_GRAPH_PERCENT IS '상위 그래프 퍼센트'; +COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.TOP_VERSUS_SCORE IS '상위 비교 스코어'; +COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.MID_NAME IS '중위 이름'; COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.MID_NUMBER_OF_ADVANTAGES IS '중위 스펙 개수'; COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.MID_LIKE_COUNT IS '중위 좋아요 개수'; COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.MID_TOTAL_REGISTERED_POSTS IS '중위 등록 글 개수'; COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.MID_REGISTERED_HASH_TAG IS '중위 등록 해시태그 개수'; +COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.MID_GRAPH_PERCENT IS '중위 그래프 퍼센트'; +COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.MID_VERSUS_SCORE IS '중위 비교 스코어'; +COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.BOT_NAME IS '하위 이름'; COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.BOT_NUMBER_OF_ADVANTAGES IS '하위 스펙 개수'; COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.BOT_LIKE_COUNT IS '하위 좋아요 개수'; COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.BOT_TOTAL_REGISTERED_POSTS IS '하위 등록 글 개수'; COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.BOT_REGISTERED_HASH_TAG IS '하위 등록 해시태그 개수'; - -COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.TOP_GRAPH_PERCENT IS '상위 그래프 퍼센트'; -COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.MID_GRAPH_PERCENT IS '중위 그래프 퍼센트'; COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.BOT_GRAPH_PERCENT IS '하위 그래프 퍼센트'; - -COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.TOP_VERSUS_SCORE IS '상위 비교 스코어'; -COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.MID_VERSUS_SCORE IS '중위 비교 스코어'; COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.BOT_VERSUS_SCORE IS '하위 비교 스코어'; COMMENT ON COLUMN T_JSTREE_AGGREGATE_RESULT.TOTAL_TRAFFIC IS '총 트래픽'; @@ -209,7 +215,7 @@ /** PK - FK **/ -ALTER TABLE T_JSTREE_MENU ADD ( +ALTER TABLE T_JSTREE_MENU ADD( CONSTRAINT T_JSTREE_MENU_FK_AR FOREIGN KEY (AGGREGATE_RESULT_ID) REFERENCES T_JSTREE_AGGREGATE_RESULT (C_ID)); Index: standard/project/web/script/dml/oracle/egovframework/api/rivalWar/aggregateResult/AggregateResult_Data_Script_Oracle.sql =================================================================== diff -u -r9b9b8da01d85c0ddf56c2230d1312b99d8f29fce -r6eb8c9f10e9760f829ca900f780b209fe7080028 --- standard/project/web/script/dml/oracle/egovframework/api/rivalWar/aggregateResult/AggregateResult_Data_Script_Oracle.sql (.../AggregateResult_Data_Script_Oracle.sql) (revision 9b9b8da01d85c0ddf56c2230d1312b99d8f29fce) +++ standard/project/web/script/dml/oracle/egovframework/api/rivalWar/aggregateResult/AggregateResult_Data_Script_Oracle.sql (.../AggregateResult_Data_Script_Oracle.sql) (revision 6eb8c9f10e9760f829ca900f780b209fe7080028) @@ -1,67 +1,59 @@ Insert into T_JSTREE_AGGREGATE_RESULT - ( C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, - TOP_NUMBER_OF_ADVANTAGES, TOP_LIKE_COUNT, TOP_TOTAL_REGISTERED_POSTS, TOP_REGISTERED_HASH_TAG, - MID_NUMBER_OF_ADVANTAGES, MID_LIKE_COUNT, MID_TOTAL_REGISTERED_POSTS, MID_REGISTERED_HASH_TAG, - BOT_NUMBER_OF_ADVANTAGES, BOT_LIKE_COUNT, BOT_TOTAL_REGISTERED_POSTS, BOT_REGISTERED_HASH_TAG, TOP_GRAPH_PERCENT, - MID_GRAPH_PERCENT, BOT_GRAPH_PERCENT, TOP_VERSUS_SCORE, MID_VERSUS_SCORE, BOT_VERSUS_SCORE, TOTAL_TRAFFIC, - UNIQUE_VISIT, REVISIT_COUNT, PAGE_VIEW, TOTAL_ARTICLE, TOTAL_LIKE_COUNT, TOTAL_SPEC_COUNT, TOTAL_HASH_COUNT, + (C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, CAL_TIME, + TOP_NAME, TOP_NUMBER_OF_ADVANTAGES, TOP_LIKE_COUNT, TOP_TOTAL_REGISTERED_POSTS, TOP_REGISTERED_HASH_TAG, TOP_GRAPH_PERCENT, TOP_VERSUS_SCORE, + MID_NAME, MID_NUMBER_OF_ADVANTAGES, MID_LIKE_COUNT, MID_TOTAL_REGISTERED_POSTS, MID_REGISTERED_HASH_TAG, MID_GRAPH_PERCENT, MID_VERSUS_SCORE, + BOT_NAME, BOT_NUMBER_OF_ADVANTAGES, BOT_LIKE_COUNT, BOT_TOTAL_REGISTERED_POSTS, BOT_REGISTERED_HASH_TAG, BOT_GRAPH_PERCENT, BOT_VERSUS_SCORE, + TOTAL_TRAFFIC, UNIQUE_VISIT, REVISIT_COUNT, PAGE_VIEW, TOTAL_ARTICLE, TOTAL_LIKE_COUNT, TOTAL_SPEC_COUNT, TOTAL_HASH_COUNT, STANDARD_ERROR, EQUILIBRIUM_ASSUMPTION, PROBABILITY, LOWER_LIMIT, HIGHER_LIMIT, DISTRIBUTION_T_RESULT) Values - (1, 0, 0, 1, 8, 0, 'Root Node', 'root', - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, + (1, 0, 0, 1, 8, 0, 'Root Node', 'root', '', + '', 0, 0, 0, 0, 0, 0, + '', 0, 0, 0, 0, 0, 0, + '', 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); Insert into T_JSTREE_AGGREGATE_RESULT - ( C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, - TOP_NUMBER_OF_ADVANTAGES, TOP_LIKE_COUNT, TOP_TOTAL_REGISTERED_POSTS, TOP_REGISTERED_HASH_TAG, - MID_NUMBER_OF_ADVANTAGES, MID_LIKE_COUNT, MID_TOTAL_REGISTERED_POSTS, MID_REGISTERED_HASH_TAG, - BOT_NUMBER_OF_ADVANTAGES, BOT_LIKE_COUNT, BOT_TOTAL_REGISTERED_POSTS, BOT_REGISTERED_HASH_TAG, TOP_GRAPH_PERCENT, - MID_GRAPH_PERCENT, BOT_GRAPH_PERCENT, TOP_VERSUS_SCORE, MID_VERSUS_SCORE, BOT_VERSUS_SCORE, TOTAL_TRAFFIC, - UNIQUE_VISIT, REVISIT_COUNT, PAGE_VIEW, TOTAL_ARTICLE, TOTAL_LIKE_COUNT, TOTAL_SPEC_COUNT, TOTAL_HASH_COUNT, + (C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, CAL_TIME, + TOP_NAME, TOP_NUMBER_OF_ADVANTAGES, TOP_LIKE_COUNT, TOP_TOTAL_REGISTERED_POSTS, TOP_REGISTERED_HASH_TAG, TOP_GRAPH_PERCENT, TOP_VERSUS_SCORE, + MID_NAME, MID_NUMBER_OF_ADVANTAGES, MID_LIKE_COUNT, MID_TOTAL_REGISTERED_POSTS, MID_REGISTERED_HASH_TAG, MID_GRAPH_PERCENT, MID_VERSUS_SCORE, + BOT_NAME, BOT_NUMBER_OF_ADVANTAGES, BOT_LIKE_COUNT, BOT_TOTAL_REGISTERED_POSTS, BOT_REGISTERED_HASH_TAG, BOT_GRAPH_PERCENT, BOT_VERSUS_SCORE, + TOTAL_TRAFFIC, UNIQUE_VISIT, REVISIT_COUNT, PAGE_VIEW, TOTAL_ARTICLE, TOTAL_LIKE_COUNT, TOTAL_SPEC_COUNT, TOTAL_HASH_COUNT, STANDARD_ERROR, EQUILIBRIUM_ASSUMPTION, PROBABILITY, LOWER_LIMIT, HIGHER_LIMIT, DISTRIBUTION_T_RESULT) Values - (2, 1, 0, 2, 7, 1, 'First Child', 'drive', - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, + (2, 1, 0, 2, 7, 1, 'First Child', 'drive', '', + '', 0, 0, 0, 0, 0, 0, + '', 0, 0, 0, 0, 0, 0, + '', 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); Insert into T_JSTREE_AGGREGATE_RESULT - (C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, - TOP_NUMBER_OF_ADVANTAGES, TOP_LIKE_COUNT, TOP_TOTAL_REGISTERED_POSTS, TOP_REGISTERED_HASH_TAG, - MID_NUMBER_OF_ADVANTAGES, MID_LIKE_COUNT, MID_TOTAL_REGISTERED_POSTS, MID_REGISTERED_HASH_TAG, - BOT_NUMBER_OF_ADVANTAGES, BOT_LIKE_COUNT, BOT_TOTAL_REGISTERED_POSTS, BOT_REGISTERED_HASH_TAG, TOP_GRAPH_PERCENT, - MID_GRAPH_PERCENT, BOT_GRAPH_PERCENT, TOP_VERSUS_SCORE, MID_VERSUS_SCORE, BOT_VERSUS_SCORE, TOTAL_TRAFFIC, - UNIQUE_VISIT, REVISIT_COUNT, PAGE_VIEW, TOTAL_ARTICLE, TOTAL_LIKE_COUNT, TOTAL_SPEC_COUNT, TOTAL_HASH_COUNT, + (C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, CAL_TIME, + TOP_NAME, TOP_NUMBER_OF_ADVANTAGES, TOP_LIKE_COUNT, TOP_TOTAL_REGISTERED_POSTS, TOP_REGISTERED_HASH_TAG, TOP_GRAPH_PERCENT, TOP_VERSUS_SCORE, + MID_NAME, MID_NUMBER_OF_ADVANTAGES, MID_LIKE_COUNT, MID_TOTAL_REGISTERED_POSTS, MID_REGISTERED_HASH_TAG, MID_GRAPH_PERCENT, MID_VERSUS_SCORE, + BOT_NAME, BOT_NUMBER_OF_ADVANTAGES, BOT_LIKE_COUNT, BOT_TOTAL_REGISTERED_POSTS, BOT_REGISTERED_HASH_TAG, BOT_GRAPH_PERCENT, BOT_VERSUS_SCORE, + TOTAL_TRAFFIC, UNIQUE_VISIT, REVISIT_COUNT, PAGE_VIEW, TOTAL_ARTICLE, TOTAL_LIKE_COUNT, TOTAL_SPEC_COUNT, TOTAL_HASH_COUNT, STANDARD_ERROR, EQUILIBRIUM_ASSUMPTION, PROBABILITY, LOWER_LIMIT, HIGHER_LIMIT, DISTRIBUTION_T_RESULT) Values - (3, 2, 0, 3, 4, 2, 'Leaf Node', 'default', - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, + (3, 2, 0, 3, 4, 2, 'Leaf Node', 'default', '', + '', 0, 0, 0, 0, 0, 0, + '', 0, 0, 0, 0, 0, 0, + '', 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); Insert into T_JSTREE_AGGREGATE_RESULT - (C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, - TOP_NUMBER_OF_ADVANTAGES, TOP_LIKE_COUNT, TOP_TOTAL_REGISTERED_POSTS, TOP_REGISTERED_HASH_TAG, - MID_NUMBER_OF_ADVANTAGES, MID_LIKE_COUNT, MID_TOTAL_REGISTERED_POSTS, MID_REGISTERED_HASH_TAG, - BOT_NUMBER_OF_ADVANTAGES, BOT_LIKE_COUNT, BOT_TOTAL_REGISTERED_POSTS, BOT_REGISTERED_HASH_TAG, TOP_GRAPH_PERCENT, - MID_GRAPH_PERCENT, BOT_GRAPH_PERCENT, TOP_VERSUS_SCORE, MID_VERSUS_SCORE, BOT_VERSUS_SCORE, TOTAL_TRAFFIC, - UNIQUE_VISIT, REVISIT_COUNT, PAGE_VIEW, TOTAL_ARTICLE, TOTAL_LIKE_COUNT, TOTAL_SPEC_COUNT, TOTAL_HASH_COUNT, + (C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, CAL_TIME, + TOP_NAME, TOP_NUMBER_OF_ADVANTAGES, TOP_LIKE_COUNT, TOP_TOTAL_REGISTERED_POSTS, TOP_REGISTERED_HASH_TAG, TOP_GRAPH_PERCENT, TOP_VERSUS_SCORE, + MID_NAME, MID_NUMBER_OF_ADVANTAGES, MID_LIKE_COUNT, MID_TOTAL_REGISTERED_POSTS, MID_REGISTERED_HASH_TAG, MID_GRAPH_PERCENT, MID_VERSUS_SCORE, + BOT_NAME, BOT_NUMBER_OF_ADVANTAGES, BOT_LIKE_COUNT, BOT_TOTAL_REGISTERED_POSTS, BOT_REGISTERED_HASH_TAG, BOT_GRAPH_PERCENT, BOT_VERSUS_SCORE, + TOTAL_TRAFFIC, UNIQUE_VISIT, REVISIT_COUNT, PAGE_VIEW, TOTAL_ARTICLE, TOTAL_LIKE_COUNT, TOTAL_SPEC_COUNT, TOTAL_HASH_COUNT, STANDARD_ERROR, EQUILIBRIUM_ASSUMPTION, PROBABILITY, LOWER_LIMIT, HIGHER_LIMIT, DISTRIBUTION_T_RESULT) Values - (4, 2, 1, 5, 6, 2, 'Branch Node', 'folder', - 0, 0, 0, 0, - 0, 0, 0, 0, - 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, + (4, 2, 1, 5, 6, 2, 'Branch Node', 'folder', '', + '', 0, 0, 0, 0, 0, 0, + '', 0, 0, 0, 0, 0, 0, + '', 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); COMMIT; Index: standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/controller/AnonymousAggregateResultController.java =================================================================== diff -u -ra519d8785f296ca88790a4b8450812ef80e272c9 -r6eb8c9f10e9760f829ca900f780b209fe7080028 --- standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/controller/AnonymousAggregateResultController.java (.../AnonymousAggregateResultController.java) (revision a519d8785f296ca88790a4b8450812ef80e272c9) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/controller/AnonymousAggregateResultController.java (.../AnonymousAggregateResultController.java) (revision 6eb8c9f10e9760f829ca900f780b209fe7080028) @@ -19,6 +19,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -90,14 +91,20 @@ } @ResponseBody - @RequestMapping(value = "/getNode.do", method = RequestMethod.GET) + @RequestMapping(value = "/getNode.do", method = {RequestMethod.GET, RequestMethod.POST}) public ModelAndView getNode(AggregateResultDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request) throws Exception { - ParameterParser parser = new ParameterParser(request); + if(request.getMethod().equals("GET")){ + ParameterParser parser = new ParameterParser(request); - if (parser.getInt("c_id") <= 0) { - throw new RuntimeException(); + if (parser.getInt("c_id") <= 0 ) { + throw new RuntimeException(); + } + }else{ + if(jsTreeHibernateDTO.getC_id() <= 0){ + throw new RuntimeException(); + } } AggregateResultDTO aggregateResultDTO = aggregateResultService.getNode(jsTreeHibernateDTO); @@ -108,6 +115,30 @@ } @ResponseBody + @RequestMapping(value = "/getNodeForDatatable.do", method = {RequestMethod.GET, RequestMethod.POST}) + public ModelAndView getNodeForDatatable(AggregateResultDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request) + throws Exception { + + if(request.getMethod().equals("GET")){ + ParameterParser parser = new ParameterParser(request); + + if (parser.getInt("c_id") <= 0 ) { + throw new RuntimeException(); + } + }else{ + if(jsTreeHibernateDTO.getC_id() <= 0){ + throw new RuntimeException(); + } + } + List list = new ArrayList(); + list.add(aggregateResultService.getNode(jsTreeHibernateDTO)); + + ModelAndView modelAndView = new ModelAndView("jsonView"); + modelAndView.addObject("result", list); + return modelAndView; + } + + @ResponseBody @RequestMapping(value = "/getChildNode.do", method = RequestMethod.GET) public ModelAndView getChildNode(AggregateResultDTO jsTreeHibernateDTO, ModelMap model, HttpServletRequest request) throws Exception { Index: standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/vo/AggregateResultDTO.java =================================================================== diff -u -r9b9b8da01d85c0ddf56c2230d1312b99d8f29fce -r6eb8c9f10e9760f829ca900f780b209fe7080028 --- standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/vo/AggregateResultDTO.java (.../AggregateResultDTO.java) (revision 9b9b8da01d85c0ddf56c2230d1312b99d8f29fce) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/vo/AggregateResultDTO.java (.../AggregateResultDTO.java) (revision 6eb8c9f10e9760f829ca900f780b209fe7080028) @@ -54,21 +54,50 @@ } //우위 스펙 갯수: 6, 좋아요 획득 갯수 : 3133,총 등록 글 : 10,490, 총 등록된 해시 태그 : 4300 + //graph percent: 15%, score point: 21304 point, + private String calTime; + @Column(name = "cal_time") + public String getCalTime() { + return calTime; + } + + public void setCalTime(String calTime) { + this.calTime = calTime; + } + + private String topName; private Long topNumberOfAdvantages; + private Long topVersusScore; private Long topLikeCount; private Long topTotalRegisteredPosts; private Long topRegisteredHashTag; + private Long topGraphPercent; + private String midName; private Long midNumberOfAdvantages; private Long midLikeCount; private Long midTotalRegisteredPosts; private Long midRegisteredHashTag; + private Long midGraphPercent; + private Long midVersusScore; + private String botName; private Long botNumberOfAdvantages; private Long botLikeCount; private Long botTotalRegisteredPosts; private Long botRegisteredHashTag; + private Long botGraphPercent; + private Long botVersusScore; + @Column(name = "top_name") + public String getTopName() { + return topName; + } + + public void setTopName(String topName) { + this.topName = topName; + } + @Column(name = "top_number_of_advantages") public Long getTopNumberOfAdvantages() { return topNumberOfAdvantages; @@ -105,6 +134,33 @@ this.topRegisteredHashTag = topRegisteredHashTag; } + @Column(name = "top_graph_percent") + public Long getTopGraphPercent() { + return topGraphPercent; + } + + public void setTopGraphPercent(Long topGraphPercent) { + this.topGraphPercent = topGraphPercent; + } + + @Column(name = "top_versus_score") + public Long getTopVersusScore() { + return topVersusScore; + } + + public void setTopVersusScore(Long topVersusScore) { + this.topVersusScore = topVersusScore; + } + + @Column(name = "mid_name") + public String getMidName() { + return midName; + } + + public void setMidName(String midName) { + this.midName = midName; + } + @Column(name = "mid_number_of_advantages") public Long getMidNumberOfAdvantages() { return midNumberOfAdvantages; @@ -141,6 +197,33 @@ this.midRegisteredHashTag = midRegisteredHashTag; } + @Column(name = "mid_graph_percent") + public Long getMidGraphPercent() { + return midGraphPercent; + } + + public void setMidGraphPercent(Long midGraphPercent) { + this.midGraphPercent = midGraphPercent; + } + + @Column(name = "mid_versus_score") + public Long getMidVersusScore() { + return midVersusScore; + } + + public void setMidVersusScore(Long midVersusScore) { + this.midVersusScore = midVersusScore; + } + + @Column(name = "bot_name") + public String getBotName() { + return botName; + } + + public void setBotName(String botName) { + this.botName = botName; + } + @Column(name = "bot_number_of_advantages") public Long getBotNumberOfAdvantages() { return botNumberOfAdvantages; @@ -177,33 +260,6 @@ this.botRegisteredHashTag = botRegisteredHashTag; } - //graph percent: 15%, score point: 21304 point, - private Long topGraphPercent; - private Long midGraphPercent; - private Long botGraphPercent; - - private Long topVersusScore; - private Long midVersusScore; - private Long botVersusScore; - - @Column(name = "top_graph_percent") - public Long getTopGraphPercent() { - return topGraphPercent; - } - - public void setTopGraphPercent(Long topGraphPercent) { - this.topGraphPercent = topGraphPercent; - } - - @Column(name = "mid_graph_percent") - public Long getMidGraphPercent() { - return midGraphPercent; - } - - public void setMidGraphPercent(Long midGraphPercent) { - this.midGraphPercent = midGraphPercent; - } - @Column(name = "bot_graph_percent") public Long getBotGraphPercent() { return botGraphPercent; @@ -213,24 +269,6 @@ this.botGraphPercent = botGraphPercent; } - @Column(name = "top_versus_score") - public Long getTopVersusScore() { - return topVersusScore; - } - - public void setTopVersusScore(Long topVersusScore) { - this.topVersusScore = topVersusScore; - } - - @Column(name = "mid_versus_score") - public Long getMidVersusScore() { - return midVersusScore; - } - - public void setMidVersusScore(Long midVersusScore) { - this.midVersusScore = midVersusScore; - } - @Column(name = "bot_versus_score") public Long getBotVersusScore() { return botVersusScore; @@ -389,27 +427,31 @@ @Override public void setFieldFromNewInstance(T paramInstance) { if (paramInstance instanceof AggregateResultDTO) { + + this.setCalTime(this.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.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.setBotName(this.getBotName()); this.setBotNumberOfAdvantages(this.getBotNumberOfAdvantages()); this.setBotLikeCount(this.getBotLikeCount()); this.setBotTotalRegisteredPosts(this.getBotTotalRegisteredPosts()); this.setBotRegisteredHashTag(this.getBotRegisteredHashTag()); - - this.setTopGraphPercent(this.getTopGraphPercent()); - this.setMidGraphPercent(this.getMidGraphPercent()); this.setBotGraphPercent(this.getBotGraphPercent()); - - this.setTopVersusScore(this.getTopVersusScore()); - this.setMidVersusScore(this.getMidVersusScore()); this.setBotVersusScore(this.getBotVersusScore()); this.setTotalTraffic(this.getTotalTraffic()); @@ -429,9 +471,6 @@ this.setHigherLimit(this.getHigherLimit()); this.setDistributionTResult(this.getDistributionTResult()); - - - } } } Index: standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/api/rivalWar/aggregateResult/JsTreeView.jsp =================================================================== diff -u -ra519d8785f296ca88790a4b8450812ef80e272c9 -r6eb8c9f10e9760f829ca900f780b209fe7080028 --- standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/api/rivalWar/aggregateResult/JsTreeView.jsp (.../JsTreeView.jsp) (revision a519d8785f296ca88790a4b8450812ef80e272c9) +++ standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/api/rivalWar/aggregateResult/JsTreeView.jsp (.../JsTreeView.jsp) (revision 6eb8c9f10e9760f829ca900f780b209fe7080028) @@ -329,20 +329,29 @@
- +
- - - - - - - - + + + + + + + + + + + + + + + + + +
c_idc_parentidc_positionc_leftc_rightc_levelc_titlec_typetopNametopNumberOfAdvantagestopVersusScoretopLikeCounttopTotalRegisteredPoststopRegisteredHashTagtopGraphPercent
topNametopNumberOfAdvantagestopVersusScoretopLikeCounttopTotalRegisteredPoststopRegisteredHashTagtopGraphPercent
@@ -354,63 +363,36 @@