Index: .idea/sonarIssues.xml =================================================================== diff -u -re0f02f1e3f907f9061e980cdf1a7f439c25ae40b -r7e22b1924690824a27bb65043fd111a7861c35d3 --- .idea/sonarIssues.xml (.../sonarIssues.xml) (revision e0f02f1e3f907f9061e980cdf1a7f439c25ae40b) +++ .idea/sonarIssues.xml (.../sonarIssues.xml) (revision 7e22b1924690824a27bb65043fd111a7861c35d3) @@ -918,6 +918,11 @@ + + + + + @@ -933,6 +938,11 @@ + + + + + Index: standard/project/web/script/ddl/oracle/egovframework/api/rivalWar/compareInfo/CompareInfo_DDL_Oracle.sql =================================================================== diff -u --- standard/project/web/script/ddl/oracle/egovframework/api/rivalWar/compareInfo/CompareInfo_DDL_Oracle.sql (revision 0) +++ standard/project/web/script/ddl/oracle/egovframework/api/rivalWar/compareInfo/CompareInfo_DDL_Oracle.sql (revision 7e22b1924690824a27bb65043fd111a7861c35d3) @@ -0,0 +1,263 @@ +/* + * JsTree 추적 로그 테이블 + * 트리거 Log를 저장합니다. + */ +CREATE TABLE T_JSTREE_COMPARE_INFO_LOG +( + C_ID NUMBER NOT NULL, + C_PARENTID NUMBER NOT NULL, + C_POSITION NUMBER NOT NULL, + C_LEFT NUMBER NOT NULL, + C_RIGHT NUMBER NOT NULL, + C_LEVEL NUMBER NOT NULL, + C_TITLE VARCHAR2(4000 BYTE), + C_TYPE VARCHAR2(4000 BYTE), + C_METHOD VARCHAR2(4000 BYTE), + C_STATE VARCHAR2(4000 BYTE), + C_DATE DATE NOT NULL +); + +COMMENT ON TABLE T_JSTREE_COMPARE_INFO_LOG IS '기본 트리 스키마 트리거 로그'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO_LOG.C_ID IS '노드 아이디'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO_LOG.C_PARENTID IS '부모 노드 아이디'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO_LOG.C_POSITION IS '노드 포지션'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO_LOG.C_LEFT IS '노드 좌측 끝 포인트'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO_LOG.C_RIGHT IS '노드 우측 끝 포인트'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO_LOG.C_LEVEL IS '노드 DEPTH '; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO_LOG.C_TITLE IS '노드 명'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO_LOG.C_TYPE IS '노드 타입'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO_LOG.C_METHOD IS '노드 변경 행위'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO_LOG.C_STATE IS '노드 상태값 ( 이전인지. 이후인지)'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO_LOG.C_DATE IS '노드 변경 시'; + +/* + * JsTree + */ +CREATE TABLE T_JSTREE_COMPARE_INFO +( + C_ID NUMBER NOT NULL, + C_PARENTID NUMBER NOT NULL, + C_POSITION NUMBER NOT NULL, + C_LEFT NUMBER NOT NULL, + C_RIGHT NUMBER NOT NULL, + C_LEVEL NUMBER NOT NULL, + C_TITLE VARCHAR2(4000 BYTE), + C_TYPE VARCHAR2(4000 BYTE), + + TOP_IMAGE_URL_1 VARCHAR2(4000 BYTE), + TOP_IMAGE_URL_2 VARCHAR2(4000 BYTE), + TOP_IMAGE_URL_3 VARCHAR2(4000 BYTE), + TOP_VENDER_URL VARCHAR2(4000 BYTE), + TOP_VENDER_TEXT VARCHAR2(4000 BYTE), + TOP_POST1_ICON VARCHAR2(4000 BYTE), + TOP_POST1_URL VARCHAR2(4000 BYTE), + TOP_POST1_TEXT VARCHAR2(4000 BYTE), + TOP_POST2_ICON VARCHAR2(4000 BYTE), + TOP_POST2_URL VARCHAR2(4000 BYTE), + TOP_POST2_TEXT VARCHAR2(4000 BYTE), + TOP_POST3_ICON VARCHAR2(4000 BYTE), + TOP_POST3_URL VARCHAR2(4000 BYTE), + TOP_POST3_TEXT VARCHAR2(4000 BYTE), + TOP_POST4_ICON VARCHAR2(4000 BYTE), + TOP_POST4_URL VARCHAR2(4000 BYTE), + TOP_POST4_TEXT VARCHAR2(4000 BYTE), + TOP_POST5_ICON VARCHAR2(4000 BYTE), + TOP_POST5_URL VARCHAR2(4000 BYTE), + TOP_POST5_TEXT VARCHAR2(4000 BYTE), + + MID_IMAGE_URL_1 VARCHAR2(4000 BYTE), + MID_IMAGE_URL_2 VARCHAR2(4000 BYTE), + MID_IMAGE_URL_3 VARCHAR2(4000 BYTE), + MID_VENDER_URL VARCHAR2(4000 BYTE), + MID_VENDER_TEXT VARCHAR2(4000 BYTE), + MID_POST1_ICON VARCHAR2(4000 BYTE), + MID_POST1_URL VARCHAR2(4000 BYTE), + MID_POST1_TEXT VARCHAR2(4000 BYTE), + MID_POST2_ICON VARCHAR2(4000 BYTE), + MID_POST2_URL VARCHAR2(4000 BYTE), + MID_POST2_TEXT VARCHAR2(4000 BYTE), + MID_POST3_ICON VARCHAR2(4000 BYTE), + MID_POST3_URL VARCHAR2(4000 BYTE), + MID_POST3_TEXT VARCHAR2(4000 BYTE), + MID_POST4_ICON VARCHAR2(4000 BYTE), + MID_POST4_URL VARCHAR2(4000 BYTE), + MID_POST4_TEXT VARCHAR2(4000 BYTE), + MID_POST5_ICON VARCHAR2(4000 BYTE), + MID_POST5_URL VARCHAR2(4000 BYTE), + MID_POST5_TEXT VARCHAR2(4000 BYTE), + + BOT_IMAGE_URL_1 VARCHAR2(4000 BYTE), + BOT_IMAGE_URL_2 VARCHAR2(4000 BYTE), + BOT_IMAGE_URL_3 VARCHAR2(4000 BYTE), + BOT_VENDER_URL VARCHAR2(4000 BYTE), + BOT_VENDER_TEXT VARCHAR2(4000 BYTE), + BOT_POST1_ICON VARCHAR2(4000 BYTE), + BOT_POST1_URL VARCHAR2(4000 BYTE), + BOT_POST1_TEXT VARCHAR2(4000 BYTE), + BOT_POST2_ICON VARCHAR2(4000 BYTE), + BOT_POST2_URL VARCHAR2(4000 BYTE), + BOT_POST2_TEXT VARCHAR2(4000 BYTE), + BOT_POST3_ICON VARCHAR2(4000 BYTE), + BOT_POST3_URL VARCHAR2(4000 BYTE), + BOT_POST3_TEXT VARCHAR2(4000 BYTE), + BOT_POST4_ICON VARCHAR2(4000 BYTE), + BOT_POST4_URL VARCHAR2(4000 BYTE), + BOT_POST4_TEXT VARCHAR2(4000 BYTE), + BOT_POST5_ICON VARCHAR2(4000 BYTE), + BOT_POST5_URL VARCHAR2(4000 BYTE), + BOT_POST5_TEXT VARCHAR2(4000 BYTE), + + CONSTRAINT T_JSTREE_COMPARE_INFO_PK PRIMARY KEY (C_ID) + /* + * CONSTRAINT T_JSTREE_COMPARE_INFO_FK1 FOREIGN KEY (OTHER_ID) REFERENCES OTHER T_JSTREE_COMPARE_INFO(C_ID) ON DELETE CASCADE + */ +); + +COMMENT ON TABLE T_JSTREE_COMPARE_INFO IS '기본 트리 스키마'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.C_ID IS '노드 아이디'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.C_PARENTID IS '부모 노드 아이디'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.C_POSITION IS '노드 포지션'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.C_LEFT IS '노드 좌측 끝 포인트'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.C_RIGHT IS '노드 우측 끝 포인트'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.C_LEVEL IS '노드 DEPTH '; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.C_TITLE IS '노드 명'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.C_TYPE IS '노드 타입'; + +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_IMAGE_URL_1 IS '상위 대표 이미지'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_IMAGE_URL_2 IS '상위 서브 이미지'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_IMAGE_URL_3 IS '상위 테일 이미지'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_VENDER_URL IS '상위 벤더 링크'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_VENDER_TEXT IS '상위 벤더 텍스트'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_POST1_ICON IS '상위 포스트 1번 아이콘'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_POST1_URL IS '상위 포스트 1번 링크'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_POST1_TEXT IS '상위 포스트 1번 링크 텍스트'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_POST2_ICON IS '상위 포스트 2번 아이콘'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_POST2_URL IS '상위 포스트 2번 링크'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_POST2_TEXT IS '상위 포스트 2번 링크 텍스트'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_POST3_ICON IS '상위 포스트 3번 아이콘'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_POST3_URL IS '상위 포스트 3번 링크'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_POST3_TEXT IS '상위 포스트 3번 링크 텍스트'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_POST4_ICON IS '상위 포스트 4번 아이콘'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_POST4_URL IS '상위 포스트 4번 링크'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_POST4_TEXT IS '상위 포스트 4번 링크 텍스트'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_POST5_ICON IS '상위 포스트 5번 아이콘'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_POST5_URL IS '상위 포스트 5번 링크'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.TOP_POST5_TEXT IS '상위 포스트 5번 링크 텍스트'; + +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_IMAGE_URL_1 IS '중위 대표 이미지'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_IMAGE_URL_2 IS '중위 서브 이미지'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_IMAGE_URL_3 IS '중위 테일 이미지'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_VENDER_URL IS '중위 벤더 링크'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_VENDER_TEXT IS '중위 벤더 텍스트'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_POST1_ICON IS '중위 포스트 1번 아이콘'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_POST1_URL IS '중위 포스트 1번 링크'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_POST1_TEXT IS '중위 포스트 1번 링크 텍스트'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_POST2_ICON IS '중위 포스트 2번 아이콘'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_POST2_URL IS '중위 포스트 2번 링크'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_POST2_TEXT IS '중위 포스트 2번 링크 텍스트'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_POST3_ICON IS '중위 포스트 3번 아이콘'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_POST3_URL IS '중위 포스트 3번 링크'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_POST3_TEXT IS '중위 포스트 3번 링크 텍스트'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_POST4_ICON IS '중위 포스트 4번 아이콘'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_POST4_URL IS '중위 포스트 4번 링크'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_POST4_TEXT IS '중위 포스트 4번 링크 텍스트'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_POST5_ICON IS '중위 포스트 5번 아이콘'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_POST5_URL IS '중위 포스트 5번 링크'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.MID_POST5_TEXT IS '중위 포스트 5번 링크 텍스트'; + +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_IMAGE_URL_1 IS '하위 대표 이미지'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_IMAGE_URL_2 IS '하위 서브 이미지'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_IMAGE_URL_3 IS '하위 테일 이미지'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_VENDER_URL IS '하위 벤더 링크'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_VENDER_TEXT IS '하위 벤더 텍스트'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_POST1_ICON IS '하위 포스트 1번 아이콘'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_POST1_URL IS '하위 포스트 1번 링크'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_POST1_TEXT IS '하위 포스트 1번 링크 텍스트'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_POST2_ICON IS '하위 포스트 2번 아이콘'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_POST2_URL IS '하위 포스트 2번 링크'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_POST2_TEXT IS '하위 포스트 2번 링크 텍스트'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_POST3_ICON IS '하위 포스트 3번 아이콘'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_POST3_URL IS '하위 포스트 3번 링크'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_POST3_TEXT IS '하위 포스트 3번 링크 텍스트'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_POST4_ICON IS '하위 포스트 4번 아이콘'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_POST4_URL IS '하위 포스트 4번 링크'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_POST4_TEXT IS '하위 포스트 4번 링크 텍스트'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_POST5_ICON IS '하위 포스트 5번 아이콘'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_POST5_URL IS '하위 포스트 5번 링크'; +COMMENT ON COLUMN T_JSTREE_COMPARE_INFO.BOT_POST5_TEXT IS '하위 포스트 5번 링크 텍스트'; +/* + * 인덱스는 되도록 걸지 말것. + * CREATE UNIQUE INDEX I_COMPREHENSIVETREE ON T_JSTREE_COMPARE_INFO + * ("C_ID" ASC) + * DROP SEQUENCE S_JSTREE_COMPARE_INFO; + */ + + +CREATE SEQUENCE S_JSTREE_COMPARE_INFO + START WITH 10 + MAXVALUE 999999999999999999999999999 + MINVALUE 0 + NOCYCLE + CACHE 20 + NOORDER; + +/* + * JsTree 트리거 + */ +CREATE OR REPLACE TRIGGER "TG_JSTREE_COMPARE_INFO" +BEFORE DELETE OR INSERT OR UPDATE +ON T_JSTREE_COMPARE_INFO +REFERENCING NEW AS NEW OLD AS OLD +FOR EACH ROW +DECLARE +tmpVar NUMBER; +/****************************************************************************** + NAME: TRIGGER_COMPREHENSIVETREE + PURPOSE: + + REVISIONS: + Ver Date Author Description + --------- ---------- --------------- ------------------------------------ + 1.0 2012-08-29 1. Created this trigger. + + NOTES: + + Automatically available Auto Replace Keywords: + Object Name: TRIGGER_COMPREHENSIVETREE + Sysdate: 2012-08-29 + Date and Time: 2012-08-29, 오후 5:26:44, and 2012-08-29 오후 5:26:44 + Username: (set in TOAD Options, Proc Templates) + Table Name: T_JSTREE_COMPARE_INFO (set in the "New PL/SQL Object" dialog) + Trigger Options: (set in the "New PL/SQL Object" dialog) +******************************************************************************/ +BEGIN + tmpVar := 0; + IF UPDATING THEN + insert into T_JSTREE_COMPARE_INFO_LOG + values (:old.C_ID,:old.C_PARENTID,:old.C_POSITION,:old.C_LEFT,:old.C_RIGHT,:old.C_LEVEL,:old.C_TITLE,:old.C_TYPE,'update','변경이전데이터',sysdate); + insert into T_JSTREE_COMPARE_INFO_LOG + values (:new.C_ID,:new.C_PARENTID,:new.C_POSITION,:new.C_LEFT,:new.C_RIGHT,:new.C_LEVEL,:new.C_TITLE,:new.C_TYPE,'update','변경이후데이터',sysdate); + END IF; + IF DELETING THEN + insert into T_JSTREE_COMPARE_INFO_LOG + values (:old.C_ID,:old.C_PARENTID,:old.C_POSITION,:old.C_LEFT,:old.C_RIGHT,:old.C_LEVEL,:old.C_TITLE,:old.C_TYPE,'delete','삭제된데이터',sysdate); + END IF; + IF INSERTING THEN + insert into T_JSTREE_COMPARE_INFO_LOG + values (:new.C_ID,:new.C_PARENTID,:new.C_POSITION,:new.C_LEFT,:new.C_RIGHT,:new.C_LEVEL,:new.C_TITLE,:new.C_TYPE,'insert','삽입된데이터',sysdate); + END IF; + + EXCEPTION + WHEN OTHERS THEN + -- Consider logging the error and then re-raise + RAISE; +END TG_JSTREE_COMPARE_INFO; + +/** +PK - FK +**/ +ALTER TABLE T_JSTREE_MENU ADD( + CONSTRAINT T_JSTREE_MENU_FK_CI + FOREIGN KEY (COMPARE_INFO_ID) + REFERENCES T_JSTREE_COMPARE_INFO (C_ID)); +/ \ No newline at end of file Index: standard/project/web/script/ddl/oracle/egovframework/api/rivalWar/menu/Menu_DDL_Oracle.sql =================================================================== diff -u -r24324f07809f2da4099c98e98327a32c9a4329cd -r7e22b1924690824a27bb65043fd111a7861c35d3 --- standard/project/web/script/ddl/oracle/egovframework/api/rivalWar/menu/Menu_DDL_Oracle.sql (.../Menu_DDL_Oracle.sql) (revision 24324f07809f2da4099c98e98327a32c9a4329cd) +++ standard/project/web/script/ddl/oracle/egovframework/api/rivalWar/menu/Menu_DDL_Oracle.sql (.../Menu_DDL_Oracle.sql) (revision 7e22b1924690824a27bb65043fd111a7861c35d3) @@ -47,6 +47,7 @@ C_VOTE_START_DATE VARCHAR2(4000 BYTE), C_VOTE_END_DATE VARCHAR2(4000 BYTE), AGGREGATE_RESULT_ID NUMBER, + COMPARE_INFO_ID NUMBER, CONSTRAINT T_JSTREE_MENU_PK PRIMARY KEY (C_ID) /* * CONSTRAINT T_JSTREE_MENU_FK1 FOREIGN KEY (OTHER_ID) REFERENCES OTHER T_JSTREE_MENU(C_ID) ON DELETE CASCADE @@ -66,6 +67,7 @@ COMMENT ON COLUMN T_JSTREE_MENU.C_VOTE_START_DATE IS '비교토론 시작일'; COMMENT ON COLUMN T_JSTREE_MENU.C_VOTE_END_DATE IS '비교토론 종료일'; COMMENT ON COLUMN T_JSTREE_MENU.AGGREGATE_RESULT_ID IS '누적집계 결과 아이디'; +COMMENT ON COLUMN T_JSTREE_MENU.COMPARE_INFO_ID IS '비교 현황 정보 아이디'; /* * 인덱스는 되도록 걸지 말것. * CREATE UNIQUE INDEX I_COMPREHENSIVETREE ON T_JSTREE_MENU Index: standard/project/web/script/dml/oracle/egovframework/api/rivalWar/compareInfo/CompareInfo_Data_Script_Oracle.sql =================================================================== diff -u --- standard/project/web/script/dml/oracle/egovframework/api/rivalWar/compareInfo/CompareInfo_Data_Script_Oracle.sql (revision 0) +++ standard/project/web/script/dml/oracle/egovframework/api/rivalWar/compareInfo/CompareInfo_Data_Script_Oracle.sql (revision 7e22b1924690824a27bb65043fd111a7861c35d3) @@ -0,0 +1,116 @@ +Insert into T_JSTREE_COMPARE_INFO + ( C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, + TOP_IMAGE_URL_1, TOP_IMAGE_URL_2, TOP_IMAGE_URL_3, TOP_VENDER_URL , TOP_VENDER_TEXT, + TOP_POST1_ICON , TOP_POST1_URL , TOP_POST1_TEXT , TOP_POST2_ICON , TOP_POST2_URL , TOP_POST2_TEXT , + TOP_POST3_ICON , TOP_POST3_URL , TOP_POST3_TEXT , TOP_POST4_ICON , TOP_POST4_URL , TOP_POST4_TEXT , + TOP_POST5_ICON , TOP_POST5_URL , TOP_POST5_TEXT , + MID_IMAGE_URL_1, MID_IMAGE_URL_2, MID_IMAGE_URL_3, MID_VENDER_URL , MID_VENDER_TEXT, + MID_POST1_ICON , MID_POST1_URL , MID_POST1_TEXT , MID_POST2_ICON , MID_POST2_URL , MID_POST2_TEXT , + MID_POST3_ICON , MID_POST3_URL , MID_POST3_TEXT , MID_POST4_ICON , MID_POST4_URL , MID_POST4_TEXT , + MID_POST5_ICON , MID_POST5_URL , MID_POST5_TEXT , + BOT_IMAGE_URL_1, BOT_IMAGE_URL_2, BOT_IMAGE_URL_3, BOT_VENDER_URL , BOT_VENDER_TEXT, + BOT_POST1_ICON , BOT_POST1_URL , BOT_POST1_TEXT , BOT_POST2_ICON , BOT_POST2_URL , BOT_POST2_TEXT , + BOT_POST3_ICON , BOT_POST3_URL , BOT_POST3_TEXT , BOT_POST4_ICON , BOT_POST4_URL , BOT_POST4_TEXT , + BOT_POST5_ICON , BOT_POST5_URL , BOT_POST5_TEXT ) +Values + ( 1, 0, 0, 1, 8, 0, 'Root Node', 'root', + 'http', 'http', 'http', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', + 'http', 'http', 'http', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', + 'http', 'http', 'http', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text'); + +Insert into T_JSTREE_COMPARE_INFO + ( C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, + TOP_IMAGE_URL_1, TOP_IMAGE_URL_2, TOP_IMAGE_URL_3, TOP_VENDER_URL , TOP_VENDER_TEXT, + TOP_POST1_ICON , TOP_POST1_URL , TOP_POST1_TEXT , TOP_POST2_ICON , TOP_POST2_URL , TOP_POST2_TEXT , + TOP_POST3_ICON , TOP_POST3_URL , TOP_POST3_TEXT , TOP_POST4_ICON , TOP_POST4_URL , TOP_POST4_TEXT , + TOP_POST5_ICON , TOP_POST5_URL , TOP_POST5_TEXT , + MID_IMAGE_URL_1, MID_IMAGE_URL_2, MID_IMAGE_URL_3, MID_VENDER_URL , MID_VENDER_TEXT, + MID_POST1_ICON , MID_POST1_URL , MID_POST1_TEXT , MID_POST2_ICON , MID_POST2_URL , MID_POST2_TEXT , + MID_POST3_ICON , MID_POST3_URL , MID_POST3_TEXT , MID_POST4_ICON , MID_POST4_URL , MID_POST4_TEXT , + MID_POST5_ICON , MID_POST5_URL , MID_POST5_TEXT , + BOT_IMAGE_URL_1, BOT_IMAGE_URL_2, BOT_IMAGE_URL_3, BOT_VENDER_URL , BOT_VENDER_TEXT, + BOT_POST1_ICON , BOT_POST1_URL , BOT_POST1_TEXT , BOT_POST2_ICON , BOT_POST2_URL , BOT_POST2_TEXT , + BOT_POST3_ICON , BOT_POST3_URL , BOT_POST3_TEXT , BOT_POST4_ICON , BOT_POST4_URL , BOT_POST4_TEXT , + BOT_POST5_ICON , BOT_POST5_URL , BOT_POST5_TEXT ) +Values + ( 2, 1, 0, 2, 7, 1, 'First Child', 'drive', + 'http', 'http', 'http', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', + 'http', 'http', 'http', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', + 'http', 'http', 'http', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text'); + +Insert into T_JSTREE_COMPARE_INFO + ( C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, + TOP_IMAGE_URL_1, TOP_IMAGE_URL_2, TOP_IMAGE_URL_3, TOP_VENDER_URL , TOP_VENDER_TEXT, + TOP_POST1_ICON , TOP_POST1_URL , TOP_POST1_TEXT , TOP_POST2_ICON , TOP_POST2_URL , TOP_POST2_TEXT , + TOP_POST3_ICON , TOP_POST3_URL , TOP_POST3_TEXT , TOP_POST4_ICON , TOP_POST4_URL , TOP_POST4_TEXT , + TOP_POST5_ICON , TOP_POST5_URL , TOP_POST5_TEXT , + MID_IMAGE_URL_1, MID_IMAGE_URL_2, MID_IMAGE_URL_3, MID_VENDER_URL , MID_VENDER_TEXT, + MID_POST1_ICON , MID_POST1_URL , MID_POST1_TEXT , MID_POST2_ICON , MID_POST2_URL , MID_POST2_TEXT , + MID_POST3_ICON , MID_POST3_URL , MID_POST3_TEXT , MID_POST4_ICON , MID_POST4_URL , MID_POST4_TEXT , + MID_POST5_ICON , MID_POST5_URL , MID_POST5_TEXT , + BOT_IMAGE_URL_1, BOT_IMAGE_URL_2, BOT_IMAGE_URL_3, BOT_VENDER_URL , BOT_VENDER_TEXT, + BOT_POST1_ICON , BOT_POST1_URL , BOT_POST1_TEXT , BOT_POST2_ICON , BOT_POST2_URL , BOT_POST2_TEXT , + BOT_POST3_ICON , BOT_POST3_URL , BOT_POST3_TEXT , BOT_POST4_ICON , BOT_POST4_URL , BOT_POST4_TEXT , + BOT_POST5_ICON , BOT_POST5_URL , BOT_POST5_TEXT ) +Values + ( 3, 2, 0, 3, 4, 2, 'Leaf Node', 'default', + 'http', 'http', 'http', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', + 'http', 'http', 'http', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', + 'http', 'http', 'http', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text'); + +Insert into T_JSTREE_COMPARE_INFO + ( C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, C_LEVEL, C_TITLE, C_TYPE, + TOP_IMAGE_URL_1, TOP_IMAGE_URL_2, TOP_IMAGE_URL_3, TOP_VENDER_URL , TOP_VENDER_TEXT, + TOP_POST1_ICON , TOP_POST1_URL , TOP_POST1_TEXT , TOP_POST2_ICON , TOP_POST2_URL , TOP_POST2_TEXT , + TOP_POST3_ICON , TOP_POST3_URL , TOP_POST3_TEXT , TOP_POST4_ICON , TOP_POST4_URL , TOP_POST4_TEXT , + TOP_POST5_ICON , TOP_POST5_URL , TOP_POST5_TEXT , + MID_IMAGE_URL_1, MID_IMAGE_URL_2, MID_IMAGE_URL_3, MID_VENDER_URL , MID_VENDER_TEXT, + MID_POST1_ICON , MID_POST1_URL , MID_POST1_TEXT , MID_POST2_ICON , MID_POST2_URL , MID_POST2_TEXT , + MID_POST3_ICON , MID_POST3_URL , MID_POST3_TEXT , MID_POST4_ICON , MID_POST4_URL , MID_POST4_TEXT , + MID_POST5_ICON , MID_POST5_URL , MID_POST5_TEXT , + BOT_IMAGE_URL_1, BOT_IMAGE_URL_2, BOT_IMAGE_URL_3, BOT_VENDER_URL , BOT_VENDER_TEXT, + BOT_POST1_ICON , BOT_POST1_URL , BOT_POST1_TEXT , BOT_POST2_ICON , BOT_POST2_URL , BOT_POST2_TEXT , + BOT_POST3_ICON , BOT_POST3_URL , BOT_POST3_TEXT , BOT_POST4_ICON , BOT_POST4_URL , BOT_POST4_TEXT , + BOT_POST5_ICON , BOT_POST5_URL , BOT_POST5_TEXT ) +Values + ( 4, 2, 1, 5, 6, 2, 'Branch Node', 'folder', + 'http', 'http', 'http', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', + 'http', 'http', 'http', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', + 'http', 'http', 'http', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text', 'icon', 'http', 'text', + 'icon', 'http', 'text'); +COMMIT; \ No newline at end of file Index: standard/project/web/script/dml/oracle/egovframework/api/rivalWar/menu/Menu_Data_Script_Oracle.sql =================================================================== diff -u -r9b9b8da01d85c0ddf56c2230d1312b99d8f29fce -r7e22b1924690824a27bb65043fd111a7861c35d3 --- standard/project/web/script/dml/oracle/egovframework/api/rivalWar/menu/Menu_Data_Script_Oracle.sql (.../Menu_Data_Script_Oracle.sql) (revision 9b9b8da01d85c0ddf56c2230d1312b99d8f29fce) +++ standard/project/web/script/dml/oracle/egovframework/api/rivalWar/menu/Menu_Data_Script_Oracle.sql (.../Menu_Data_Script_Oracle.sql) (revision 7e22b1924690824a27bb65043fd111a7861c35d3) @@ -1,25 +1,25 @@ Insert into T_JSTREE_MENU (C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, - C_LEVEL, C_TITLE, C_TYPE, C_VOTE_START_DATE, C_VOTE_END_DATE, AGGREGATE_RESULT_ID) + C_LEVEL, C_TITLE, C_TYPE, C_VOTE_START_DATE, C_VOTE_END_DATE, AGGREGATE_RESULT_ID, COMPARE_INFO_ID) Values (1, 0, 0, 1, 8, - 0, 'Root Node', 'root', '2017-01-01', '2017-03-13', 3); + 0, 'Root Node', 'root', '2017-01-01', '2017-03-13', 3 , 3); Insert into T_JSTREE_MENU (C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, - C_LEVEL, C_TITLE, C_TYPE, C_VOTE_START_DATE, C_VOTE_END_DATE, AGGREGATE_RESULT_ID) + C_LEVEL, C_TITLE, C_TYPE, C_VOTE_START_DATE, C_VOTE_END_DATE, AGGREGATE_RESULT_ID, COMPARE_INFO_ID) Values (2, 1, 0, 2, 7, - 1, 'First Child', 'drive', '2017-01-01', '2017-03-13', 3); + 1, 'First Child', 'drive', '2017-01-01', '2017-03-13', 3 , 3); Insert into T_JSTREE_MENU (C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, - C_LEVEL, C_TITLE, C_TYPE, C_VOTE_START_DATE, C_VOTE_END_DATE, AGGREGATE_RESULT_ID) + C_LEVEL, C_TITLE, C_TYPE, C_VOTE_START_DATE, C_VOTE_END_DATE, AGGREGATE_RESULT_ID, COMPARE_INFO_ID) Values (3, 2, 0, 3, 4, - 2, 'Leaf Node', 'default', '2017-01-01', '2017-03-13', 3); + 2, 'Leaf Node', 'default', '2017-01-01', '2017-03-13', 3 , 3); Insert into T_JSTREE_MENU (C_ID, C_PARENTID, C_POSITION, C_LEFT, C_RIGHT, - C_LEVEL, C_TITLE, C_TYPE, C_VOTE_START_DATE, C_VOTE_END_DATE, AGGREGATE_RESULT_ID) + C_LEVEL, C_TITLE, C_TYPE, C_VOTE_START_DATE, C_VOTE_END_DATE, AGGREGATE_RESULT_ID, COMPARE_INFO_ID) Values (4, 2, 1, 5, 6, - 2, 'Branch Node', 'folder', '2017-01-01', '2017-03-13', 3); + 2, 'Branch Node', 'folder', '2017-01-01', '2017-03-13', 3 , 3); COMMIT; \ No newline at end of file Index: standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/vo/CompareInfoDTO.java =================================================================== diff -u -re0f02f1e3f907f9061e980cdf1a7f439c25ae40b -r7e22b1924690824a27bb65043fd111a7861c35d3 --- standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/vo/CompareInfoDTO.java (.../CompareInfoDTO.java) (revision e0f02f1e3f907f9061e980cdf1a7f439c25ae40b) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/vo/CompareInfoDTO.java (.../CompareInfoDTO.java) (revision 7e22b1924690824a27bb65043fd111a7861c35d3) @@ -131,7 +131,7 @@ this.topVenderText = topVenderText; } - @Column(name = "top_post_1_icon") + @Column(name = "top_post1_icon") public String getTopPost1Icon() { return topPost1Icon; } @@ -140,7 +140,7 @@ this.topPost1Icon = topPost1Icon; } - @Column(name = "top_post_1_url") + @Column(name = "top_post1_url") public String getTopPost1Url() { return topPost1Url; } @@ -149,7 +149,7 @@ this.topPost1Url = topPost1Url; } - @Column(name = "top_post_1_text") + @Column(name = "top_post1_text") public String getTopPost1Text() { return topPost1Text; } @@ -158,7 +158,7 @@ this.topPost1Text = topPost1Text; } - @Column(name = "top_post_2_icon") + @Column(name = "top_post2_icon") public String getTopPost2Icon() { return topPost2Icon; } @@ -167,7 +167,7 @@ this.topPost2Icon = topPost2Icon; } - @Column(name = "top_post_2_url") + @Column(name = "top_post2_url") public String getTopPost2Url() { return topPost2Url; } @@ -176,7 +176,7 @@ this.topPost2Url = topPost2Url; } - @Column(name = "top_post_2_text") + @Column(name = "top_post2_text") public String getTopPost2Text() { return topPost2Text; } @@ -185,7 +185,7 @@ this.topPost2Text = topPost2Text; } - @Column(name = "top_post_3_icon") + @Column(name = "top_post3_icon") public String getTopPost3Icon() { return topPost3Icon; } @@ -194,7 +194,7 @@ this.topPost3Icon = topPost3Icon; } - @Column(name = "top_post_3_url") + @Column(name = "top_post3_url") public String getTopPost3Url() { return topPost3Url; } @@ -203,7 +203,7 @@ this.topPost3Url = topPost3Url; } - @Column(name = "top_post_3_text") + @Column(name = "top_post3_text") public String getTopPost3Text() { return topPost3Text; } @@ -212,7 +212,7 @@ this.topPost3Text = topPost3Text; } - @Column(name = "top_post_4_icon") + @Column(name = "top_post4_icon") public String getTopPost4Icon() { return topPost4Icon; } @@ -221,7 +221,7 @@ this.topPost4Icon = topPost4Icon; } - @Column(name = "top_post_4_url") + @Column(name = "top_post4_url") public String getTopPost4Url() { return topPost4Url; } @@ -230,7 +230,7 @@ this.topPost4Url = topPost4Url; } - @Column(name = "top_post_4_text") + @Column(name = "top_post4_text") public String getTopPost4Text() { return topPost4Text; } @@ -239,7 +239,7 @@ this.topPost4Text = topPost4Text; } - @Column(name = "top_post_5_icon") + @Column(name = "top_post5_icon") public String getTopPost5Icon() { return topPost5Icon; } @@ -248,7 +248,7 @@ this.topPost5Icon = topPost5Icon; } - @Column(name = "top_post_5_url") + @Column(name = "top_post5_url") public String getTopPost5Url() { return topPost5Url; } @@ -257,7 +257,7 @@ this.topPost5Url = topPost5Url; } - @Column(name = "top_post_5_text") + @Column(name = "top_post5_text") public String getTopPost5Text() { return topPost5Text; } @@ -338,7 +338,7 @@ this.midVenderText = midVenderText; } - @Column(name = "mid_post_1_icon") + @Column(name = "mid_post1_icon") public String getMidPost1Icon() { return midPost1Icon; } @@ -347,7 +347,7 @@ this.midPost1Icon = midPost1Icon; } - @Column(name = "mid_post_1_url") + @Column(name = "mid_post1_url") public String getMidPost1Url() { return midPost1Url; } @@ -356,7 +356,7 @@ this.midPost1Url = midPost1Url; } - @Column(name = "mid_post_1_text") + @Column(name = "mid_post1_text") public String getMidPost1Text() { return midPost1Text; } @@ -365,7 +365,7 @@ this.midPost1Text = midPost1Text; } - @Column(name = "mid_post_2_icon") + @Column(name = "mid_post2_icon") public String getMidPost2Icon() { return midPost2Icon; } @@ -374,7 +374,7 @@ this.midPost2Icon = midPost2Icon; } - @Column(name = "mid_post_2_url") + @Column(name = "mid_post2_url") public String getMidPost2Url() { return midPost2Url; } @@ -383,7 +383,7 @@ this.midPost2Url = midPost2Url; } - @Column(name = "mid_post_2_text") + @Column(name = "mid_post2_text") public String getMidPost2Text() { return midPost2Text; } @@ -392,7 +392,7 @@ this.midPost2Text = midPost2Text; } - @Column(name = "mid_post_3_icon") + @Column(name = "mid_post3_icon") public String getMidPost3Icon() { return midPost3Icon; } @@ -401,7 +401,7 @@ this.midPost3Icon = midPost3Icon; } - @Column(name = "mid_post_3_url") + @Column(name = "mid_post3_url") public String getMidPost3Url() { return midPost3Url; } @@ -410,7 +410,7 @@ this.midPost3Url = midPost3Url; } - @Column(name = "mid_post_3_text") + @Column(name = "mid_post3_text") public String getMidPost3Text() { return midPost3Text; } @@ -419,7 +419,7 @@ this.midPost3Text = midPost3Text; } - @Column(name = "mid_post_4_icon") + @Column(name = "mid_post4_icon") public String getMidPost4Icon() { return midPost4Icon; } @@ -428,7 +428,7 @@ this.midPost4Icon = midPost4Icon; } - @Column(name = "mid_post_4_url") + @Column(name = "mid_post4_url") public String getMidPost4Url() { return midPost4Url; } @@ -437,7 +437,7 @@ this.midPost4Url = midPost4Url; } - @Column(name = "mid_post_4_text") + @Column(name = "mid_post4_text") public String getMidPost4Text() { return midPost4Text; } @@ -446,7 +446,7 @@ this.midPost4Text = midPost4Text; } - @Column(name = "mid_post_5_icon") + @Column(name = "mid_post5_icon") public String getMidPost5Icon() { return midPost5Icon; } @@ -455,7 +455,7 @@ this.midPost5Icon = midPost5Icon; } - @Column(name = "mid_post_5_url") + @Column(name = "mid_post5_url") public String getMidPost5Url() { return midPost5Url; } @@ -464,7 +464,7 @@ this.midPost5Url = midPost5Url; } - @Column(name = "mid_post_5_text") + @Column(name = "mid_post5_text") public String getMidPost5Text() { return midPost5Text; } @@ -545,7 +545,7 @@ this.botVenderText = botVenderText; } - @Column(name = "bot_post_1_icon") + @Column(name = "bot_post1_icon") public String getBotPost1Icon() { return botPost1Icon; } @@ -554,7 +554,7 @@ this.botPost1Icon = botPost1Icon; } - @Column(name = "bot_post_1_url") + @Column(name = "bot_post1_url") public String getBotPost1Url() { return botPost1Url; } @@ -563,7 +563,7 @@ this.botPost1Url = botPost1Url; } - @Column(name = "bot_post_1_text") + @Column(name = "bot_post1_text") public String getBotPost1Text() { return botPost1Text; } @@ -572,7 +572,7 @@ this.botPost1Text = botPost1Text; } - @Column(name = "bot_post_2_icon") + @Column(name = "bot_post2_icon") public String getBotPost2Icon() { return botPost2Icon; } @@ -581,7 +581,7 @@ this.botPost2Icon = botPost2Icon; } - @Column(name = "bot_post_2_url") + @Column(name = "bot_post2_url") public String getBotPost2Url() { return botPost2Url; } @@ -590,7 +590,7 @@ this.botPost2Url = botPost2Url; } - @Column(name = "bot_post_2_text") + @Column(name = "bot_post2_text") public String getBotPost2Text() { return botPost2Text; } @@ -599,7 +599,7 @@ this.botPost2Text = botPost2Text; } - @Column(name = "bot_post_3_icon") + @Column(name = "bot_post3_icon") public String getBotPost3Icon() { return botPost3Icon; } @@ -608,7 +608,7 @@ this.botPost3Icon = botPost3Icon; } - @Column(name = "bot_post_3_url") + @Column(name = "bot_post3_url") public String getBotPost3Url() { return botPost3Url; } @@ -617,7 +617,7 @@ this.botPost3Url = botPost3Url; } - @Column(name = "bot_post_3_text") + @Column(name = "bot_post3_text") public String getBotPost3Text() { return botPost3Text; } @@ -626,7 +626,7 @@ this.botPost3Text = botPost3Text; } - @Column(name = "bot_post_4_icon") + @Column(name = "bot_post4_icon") public String getBotPost4Icon() { return botPost4Icon; } @@ -635,7 +635,7 @@ this.botPost4Icon = botPost4Icon; } - @Column(name = "bot_post_4_url") + @Column(name = "bot_post4_url") public String getBotPost4Url() { return botPost4Url; } @@ -644,7 +644,7 @@ this.botPost4Url = botPost4Url; } - @Column(name = "bot_post_4_text") + @Column(name = "bot_post4_text") public String getBotPost4Text() { return botPost4Text; } @@ -653,7 +653,7 @@ this.botPost4Text = botPost4Text; } - @Column(name = "bot_post_5_icon") + @Column(name = "bot_post5_icon") public String getBotPost5Icon() { return botPost5Icon; } @@ -662,7 +662,7 @@ this.botPost5Icon = botPost5Icon; } - @Column(name = "bot_post_5_url") + @Column(name = "bot_post5_url") public String getBotPost5Url() { return botPost5Url; } @@ -671,7 +671,7 @@ this.botPost5Url = botPost5Url; } - @Column(name = "bot_post_5_text") + @Column(name = "bot_post5_text") public String getBotPost5Text() { return botPost5Text; } Index: standard/project/web/src/main/java/egovframework/api/rivalWar/menu/vo/MenuDTO.java =================================================================== diff -u -ra95579dfb9383b52665f1bcea22849513b27f4ef -r7e22b1924690824a27bb65043fd111a7861c35d3 --- standard/project/web/src/main/java/egovframework/api/rivalWar/menu/vo/MenuDTO.java (.../MenuDTO.java) (revision a95579dfb9383b52665f1bcea22849513b27f4ef) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/menu/vo/MenuDTO.java (.../MenuDTO.java) (revision 7e22b1924690824a27bb65043fd111a7861c35d3) @@ -2,6 +2,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import egovframework.api.rivalWar.aggregateResult.vo.AggregateResultDTO; +import egovframework.api.rivalWar.compareInfo.vo.CompareInfoDTO; import egovframework.com.ext.jstree.springHibernate.core.vo.JsTreeHibernateSearchDTO; import org.hibernate.annotations.Cache; import org.hibernate.annotations.*; @@ -93,4 +94,17 @@ public void setAggregateResultDTO(AggregateResultDTO aggregateResultDTO) { this.aggregateResultDTO = aggregateResultDTO; } + + private CompareInfoDTO compareInfoDTO; + + @JsonIgnore + @OneToOne(cascade = CascadeType.ALL) + @JoinColumn(name = "COMPARE_INFO_ID") + public CompareInfoDTO getCompareInfoDTO() { + return compareInfoDTO; + } + + public void setCompareInfoDTO(CompareInfoDTO compareInfoDTO) { + this.compareInfoDTO = compareInfoDTO; + } } Index: standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/api/rivalWar/compareInfo/JsTreeView.jsp =================================================================== diff -u -re0f02f1e3f907f9061e980cdf1a7f439c25ae40b -r7e22b1924690824a27bb65043fd111a7861c35d3 --- standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/api/rivalWar/compareInfo/JsTreeView.jsp (.../JsTreeView.jsp) (revision e0f02f1e3f907f9061e980cdf1a7f439c25ae40b) +++ standard/project/web/src/main/webapp/WEB-INF/jsp/egovframework/api/rivalWar/compareInfo/JsTreeView.jsp (.../JsTreeView.jsp) (revision 7e22b1924690824a27bb65043fd111a7861c35d3) @@ -328,113 +328,80 @@
- - - - - - - - - + + + + + + + + + - + - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
c_idc_parentidc_positionc_leftc_rightc_levelc_titlec_type
c_idc_parentidc_positionc_leftc_rightc_levelc_titlec_typecalTimetopImageUrl1 + topImageUrl2 + topImageUrl3 + topVenderUrl + topVenderText + topPost1Icon + topPost1Url + topPost1Text + topPost2Icon + topPost2Url + topPost2Text + topPost3Icon + topPost3Url + topPost3Text + topPost4Icon + topPost4Url + topPost4Text + topPost5Icon + topPost5Url + topPost5Text - topNametopNumberOfAdvantagestopVersusScoretopLikeCounttopTotalRegisteredPoststopRegisteredHashTagtopGraphPercentmidImageUrl1 + midImageUrl2 + midImageUrl3 + midVenderUrl + midVenderText + midPost1Icon + midPost1Url + midPost1Text + midPost2Icon + midPost2Url + midPost2Text + midPost3Icon + midPost3Url + midPost3Text + midPost4Icon + midPost4Url + midPost4Text + midPost5Icon + midPost5Url + midPost5Text - midNamemidNumberOfAdvantagesmidLikeCountmidTotalRegisteredPostsmidRegisteredHashTagmidGraphPercentmidVersusScorebotNamebotNumberOfAdvantagesbotLikeCountbotTotalRegisteredPostsbotRegisteredHashTagbotGraphPercentbotVersusScoretotalTrafficuniqueVisitrevisitCountpageViewtotalArticletotalLikeCounttotalSpecCounttotalHashCountstandardErrorequilibriumAssumptionprobabilitylowerLimithigherLimitdistributionTResult
botImageUrl1 + botImageUrl2 + botImageUrl3 + botVenderUrl + botVenderText + botPost1Icon + botPost1Url + botPost1Text + botPost2Icon + botPost2Url + botPost2Text + botPost3Icon + botPost3Url + botPost3Text + botPost4Icon + botPost4Url + botPost4Text + botPost5Icon + botPost5Url + botPost5Text +
c_idc_parentidc_positionc_leftc_rightc_levelc_titlec_typecalTimetopNametopNumberOfAdvantagestopVersusScoretopLikeCounttopTotalRegisteredPoststopRegisteredHashTagtopGraphPercentmidNamemidNumberOfAdvantagesmidLikeCountmidTotalRegisteredPostsmidRegisteredHashTagmidGraphPercentmidVersusScorebotNamebotNumberOfAdvantagesbotLikeCountbotTotalRegisteredPostsbotRegisteredHashTagbotGraphPercentbotVersusScoretotalTrafficuniqueVisitrevisitCountpageViewtotalArticletotalLikeCounttotalSpecCounttotalHashCountstandardErrorequilibriumAssumptionprobabilitylowerLimithigherLimitdistributionTResult
@@ -457,46 +424,67 @@ d.c_title = d.data.default.c_title; d.c_type = d.data.default.c_type; - d.calTime = d.data.default.calTime; - d.topName = d.data.default.topName; - d.topNumberOfAdvantages = d.data.default.topNumberOfAdvantages; - d.topVersusScore = d.data.default.topVersusScore; - d.topLikeCount = d.data.default.topLikeCount; - d.topTotalRegisteredPosts = d.data.default.topTotalRegisteredPosts; - d.topRegisteredHashTag = d.data.default.topRegisteredHashTag; - d.topGraphPercent = d.data.default.topGraphPercent; + d.topImageUrl1 = d.data.default.topImageUrl1; + d.topImageUrl2 = d.data.default.topImageUrl2; + d.topImageUrl3 = d.data.default.topImageUrl3; + d.topVenderUrl = d.data.default.topVenderUrl; + d.topVenderText = d.data.default.topVenderText; + d.topPost1Icon = d.data.default.topPost1Icon; + d.topPost1Url = d.data.default.topPost1Url; + d.topPost1Text = d.data.default.topPost1Text; + d.topPost2Icon = d.data.default.topPost2Icon; + d.topPost2Url = d.data.default.topPost2Url; + d.topPost2Text = d.data.default.topPost2Text; + d.topPost3Icon = d.data.default.topPost3Icon; + d.topPost3Url = d.data.default.topPost3Url; + d.topPost3Text = d.data.default.topPost3Text; + d.topPost4Icon = d.data.default.topPost4Icon; + d.topPost4Url = d.data.default.topPost4Url; + d.topPost4Text = d.data.default.topPost4Text; + d.topPost5Icon = d.data.default.topPost5Icon; + d.topPost5Url = d.data.default.topPost5Url; + d.topPost5Text = d.data.default.topPost5Text; + d.midImageUrl1 = d.data.default.midImageUrl1; + d.midImageUrl2 = d.data.default.midImageUrl2; + d.midImageUrl3 = d.data.default.midImageUrl3; + d.midVenderUrl = d.data.default.midVenderUrl; + d.midVenderText = d.data.default.midVenderText; + d.midPost1Icon = d.data.default.midPost1Icon; + d.midPost1Url = d.data.default.midPost1Url; + d.midPost1Text = d.data.default.midPost1Text; + d.midPost2Icon = d.data.default.midPost2Icon; + d.midPost2Url = d.data.default.midPost2Url; + d.midPost2Text = d.data.default.midPost2Text; + d.midPost3Icon = d.data.default.midPost3Icon; + d.midPost3Url = d.data.default.midPost3Url; + d.midPost3Text = d.data.default.midPost3Text; + d.midPost4Icon = d.data.default.midPost4Icon; + d.midPost4Url = d.data.default.midPost4Url; + d.midPost4Text = d.data.default.midPost4Text; + d.midPost5Icon = d.data.default.midPost5Icon; + d.midPost5Url = d.data.default.midPost5Url; + d.midPost5Text = d.data.default.midPost5Text; + d.botImageUrl1 = d.data.default.botImageUrl1; + d.botImageUrl2 = d.data.default.botImageUrl2; + d.botImageUrl3 = d.data.default.botImageUrl3; + d.botVenderUrl = d.data.default.botVenderUrl; + d.botVenderText = d.data.default.botVenderText; + d.botPost1Icon = d.data.default.botPost1Icon; + d.botPost1Url = d.data.default.botPost1Url; + d.botPost1Text = d.data.default.botPost1Text; + d.botPost2Icon = d.data.default.botPost2Icon; + d.botPost2Url = d.data.default.botPost2Url; + d.botPost2Text = d.data.default.botPost2Text; + d.botPost3Icon = d.data.default.botPost3Icon; + d.botPost3Url = d.data.default.botPost3Url; + d.botPost3Text = d.data.default.botPost3Text; + d.botPost4Icon = d.data.default.botPost4Icon; + d.botPost4Url = d.data.default.botPost4Url; + d.botPost4Text = d.data.default.botPost4Text; + d.botPost5Icon = d.data.default.botPost5Icon; + d.botPost5Url = d.data.default.botPost5Url; + d.botPost5Text = d.data.default.botPost5Text; - d.midName = d.data.default.midName; - d.midNumberOfAdvantages = d.data.default.midNumberOfAdvantages; - d.midLikeCount = d.data.default.midLikeCount; - d.midTotalRegisteredPosts = d.data.default.midTotalRegisteredPosts; - d.midRegisteredHashTag = d.data.default.midRegisteredHashTag; - d.midGraphPercent = d.data.default.midGraphPercent; - d.midVersusScore = d.data.default.midVersusScore; - - d.botName = d.data.default.botName; - d.botNumberOfAdvantages = d.data.default.botNumberOfAdvantages; - d.botLikeCount = d.data.default.botLikeCount; - d.botTotalRegisteredPosts = d.data.default.botTotalRegisteredPosts; - d.botRegisteredHashTag = d.data.default.botRegisteredHashTag; - d.botGraphPercent = d.data.default.botGraphPercent; - d.botVersusScore = d.data.default.botVersusScore; - - d.totalTraffic = d.data.default.totalTraffic; - d.uniqueVisit = d.data.default.uniqueVisit; - d.revisitCount = d.data.default.revisitCount; - d.pageView = d.data.default.pageView; - d.totalArticle = d.data.default.totalArticle; - d.totalLikeCount = d.data.default.totalLikeCount; - d.totalSpecCount = d.data.default.totalSpecCount; - - d.totalHashCount = d.data.default.totalHashCount; - d.standardError = d.data.default.standardError; - d.equilibriumAssumption = d.data.default.equilibriumAssumption; - d.probability = d.data.default.probability; - d.lowerLimit = d.data.default.lowerLimit; - d.higherLimit = d.data.default.higherLimit; - d.distributionTResult = d.data.default.distributionTResult; delete(d.data); } }, @@ -519,77 +507,125 @@ },{ label: "c_type:", name: "c_type" },{ - label: "calTime:", name: "calTime" + label: "topImageUrl1:", name: "topImageUrl1" },{ - label: "topName:", name: "topName" - }, { - label: "topNumberOfAdvantages:", name: "topNumberOfAdvantages" - }, { - label: "topVersusScore:", name: "topVersusScore" - }, { - label: "topLikeCount:", name: "topLikeCount" - }, { - label: "topTotalRegisteredPosts:", name: "topTotalRegisteredPosts" - }, { - label: "topRegisteredHashTag:", name: "topRegisteredHashTag" - }, { - label: "topGraphPercent:", name: "topGraphPercent" - }, { - label: "midName:", name: "midName" - }, { - label: "midNumberOfAdvantages:", name: "midNumberOfAdvantages" - }, { - label: "midLikeCount:", name: "midLikeCount" - }, { - label: "midTotalRegisteredPosts:", name: "midTotalRegisteredPosts" - }, { - label: "midRegisteredHashTag:", name: "midRegisteredHashTag" - }, { - label: "midGraphPercent:", name: "midGraphPercent" - }, { - label: "midVersusScore:", name: "midVersusScore" - }, { - label: "botName:", name: "botName" - }, { - label: "botNumberOfAdvantages:", name: "botNumberOfAdvantages" - }, { - label: "botLikeCount:", name: "botLikeCount" - }, { - label: "botTotalRegisteredPosts:", name: "botTotalRegisteredPosts" - }, { - label: "botRegisteredHashTag:", name: "botRegisteredHashTag" - }, { - label: "botGraphPercent:", name: "botGraphPercent" - }, { - label: "botVersusScore:", name: "botVersusScore" - }, { - label: "totalTraffic:", name: "totalTraffic" - }, { - label: "uniqueVisit:", name: "uniqueVisit" - }, { - label: "revisitCount:", name: "revisitCount" - }, { - label: "pageView:", name: "pageView" - }, { - label: "totalArticle:", name: "totalArticle" - }, { - label: "totalLikeCount:", name: "totalLikeCount" - }, { - label: "totalSpecCount:", name: "totalSpecCount" - }, { - label: "totalHashCount:", name: "totalHashCount" - }, { - label: "standardError:", name: "standardError" - }, { - label: "equilibriumAssumption:", name: "equilibriumAssumption" - }, { - label: "probability:", name: "probability" - }, { - label: "lowerLimit:", name: "lowerLimit" - }, { - label: "higherLimit:", name: "higherLimit" - }, { - label: "distributionTResult:", name: "distributionTResult" + label: "topImageUrl2:", name: "topImageUrl2" + },{ + label: "topImageUrl3:", name: "topImageUrl3" + },{ + label: "topVenderUrl:", name: "topVenderUrl" + },{ + label: "topVenderText:", name: "topVenderText" + },{ + label: "topPost1Icon:", name: "topPost1Icon" + },{ + label: "topPost1Url:", name: "topPost1Url" + },{ + label: "topPost1Text:", name: "topPost1Text" + },{ + label: "topPost2Icon:", name: "topPost2Icon" + },{ + label: "topPost2Url:", name: "topPost2Url" + },{ + label: "topPost2Text:", name: "topPost2Text" + },{ + label: "topPost3Icon:", name: "topPost3Icon" + },{ + label: "topPost3Url:", name: "topPost3Url" + },{ + label: "topPost3Text:", name: "topPost3Text" + },{ + label: "topPost4Icon:", name: "topPost4Icon" + },{ + label: "topPost4Url:", name: "topPost4Url" + },{ + label: "topPost4Text:", name: "topPost4Text" + },{ + label: "topPost5Icon:", name: "topPost5Icon" + },{ + label: "topPost5Url:", name: "topPost5Url" + },{ + label: "topPost5Text:", name: "topPost5Text" + },{ + label: "midImageUrl1:", name: "midImageUrl1" + },{ + label: "midImageUrl2:", name: "midImageUrl2" + },{ + label: "midImageUrl3:", name: "midImageUrl3" + },{ + label: "midVenderUrl:", name: "midVenderUrl" + },{ + label: "midVenderText:", name: "midVenderText" + },{ + label: "midPost1Icon:", name: "midPost1Icon" + },{ + label: "midPost1Url:", name: "midPost1Url" + },{ + label: "midPost1Text:", name: "midPost1Text" + },{ + label: "midPost2Icon:", name: "midPost2Icon" + },{ + label: "midPost2Url:", name: "midPost2Url" + },{ + label: "midPost2Text:", name: "midPost2Text" + },{ + label: "midPost3Icon:", name: "midPost3Icon" + },{ + label: "midPost3Url:", name: "midPost3Url" + },{ + label: "midPost3Text:", name: "midPost3Text" + },{ + label: "midPost4Icon:", name: "midPost4Icon" + },{ + label: "midPost4Url:", name: "midPost4Url" + },{ + label: "midPost4Text:", name: "midPost4Text" + },{ + label: "midPost5Icon:", name: "midPost5Icon" + },{ + label: "midPost5Url:", name: "midPost5Url" + },{ + label: "midPost5Text:", name: "midPost5Text" + },{ + label: "botImageUrl1:", name: "botImageUrl1" + },{ + label: "botImageUrl2:", name: "botImageUrl2" + },{ + label: "botImageUrl3:", name: "botImageUrl3" + },{ + label: "botVenderUrl:", name: "botVenderUrl" + },{ + label: "botVenderText:", name: "botVenderText" + },{ + label: "botPost1Icon:", name: "botPost1Icon" + },{ + label: "botPost1Url:", name: "botPost1Url" + },{ + label: "botPost1Text:", name: "botPost1Text" + },{ + label: "botPost2Icon:", name: "botPost2Icon" + },{ + label: "botPost2Url:", name: "botPost2Url" + },{ + label: "botPost2Text:", name: "botPost2Text" + },{ + label: "botPost3Icon:", name: "botPost3Icon" + },{ + label: "botPost3Url:", name: "botPost3Url" + },{ + label: "botPost3Text:", name: "botPost3Text" + },{ + label: "botPost4Icon:", name: "botPost4Icon" + },{ + label: "botPost4Url:", name: "botPost4Url" + },{ + label: "botPost4Text:", name: "botPost4Text" + },{ + label: "botPost5Icon:", name: "botPost5Icon" + },{ + label: "botPost5Url:", name: "botPost5Url" + },{ + label: "botPost5Text:", name: "botPost5Text" } ] }); @@ -621,47 +657,68 @@ {"data": "c_title"}, {"data": "c_type"}, - {"data": "calTime"}, + {"data": "topImageUrl1"}, + {"data": "topImageUrl2"}, + {"data": "topImageUrl3"}, + {"data": "topVenderUrl"}, + {"data": "topVenderText"}, + {"data": "topPost1Icon"}, + {"data": "topPost1Url"}, + {"data": "topPost1Text"}, + {"data": "topPost2Icon"}, + {"data": "topPost2Url"}, + {"data": "topPost2Text"}, + {"data": "topPost3Icon"}, + {"data": "topPost3Url"}, + {"data": "topPost3Text"}, + {"data": "topPost4Icon"}, + {"data": "topPost4Url"}, + {"data": "topPost4Text"}, + {"data": "topPost5Icon"}, + {"data": "topPost5Url"}, + {"data": "topPost5Text"}, - {"data": "topName"}, - {"data": "topNumberOfAdvantages"}, - {"data": "topVersusScore"}, - {"data": "topLikeCount"}, - {"data": "topTotalRegisteredPosts"}, - {"data": "topRegisteredHashTag"}, - {"data": "topGraphPercent"}, + {"data": "midImageUrl1"}, + {"data": "midImageUrl2"}, + {"data": "midImageUrl3"}, + {"data": "midVenderUrl"}, + {"data": "midVenderText"}, + {"data": "midPost1Icon"}, + {"data": "midPost1Url"}, + {"data": "midPost1Text"}, + {"data": "midPost2Icon"}, + {"data": "midPost2Url"}, + {"data": "midPost2Text"}, + {"data": "midPost3Icon"}, + {"data": "midPost3Url"}, + {"data": "midPost3Text"}, + {"data": "midPost4Icon"}, + {"data": "midPost4Url"}, + {"data": "midPost4Text"}, + {"data": "midPost5Icon"}, + {"data": "midPost5Url"}, + {"data": "midPost5Text"}, - {"data": "midName"}, - {"data": "midNumberOfAdvantages"}, - {"data": "midLikeCount"}, - {"data": "midTotalRegisteredPosts"}, - {"data": "midRegisteredHashTag"}, - {"data": "midGraphPercent"}, - {"data": "midVersusScore"}, - - {"data": "botName"}, - {"data": "botNumberOfAdvantages"}, - {"data": "botLikeCount"}, - {"data": "botTotalRegisteredPosts"}, - {"data": "botRegisteredHashTag"}, - {"data": "botGraphPercent"}, - {"data": "botVersusScore"}, - - {"data": "totalTraffic"}, - {"data": "uniqueVisit"}, - {"data": "revisitCount"}, - {"data": "pageView"}, - {"data": "totalArticle"}, - {"data": "totalLikeCount"}, - {"data": "totalSpecCount"}, - - {"data": "totalHashCount"}, - {"data": "standardError"}, - {"data": "equilibriumAssumption"}, - {"data": "probability"}, - {"data": "lowerLimit"}, - {"data": "higherLimit"}, - {"data": "distributionTResult"} + {"data": "botImageUrl1"}, + {"data": "botImageUrl2"}, + {"data": "botImageUrl3"}, + {"data": "botVenderUrl"}, + {"data": "botVenderText"}, + {"data": "botPost1Icon"}, + {"data": "botPost1Url"}, + {"data": "botPost1Text"}, + {"data": "botPost2Icon"}, + {"data": "botPost2Url"}, + {"data": "botPost2Text"}, + {"data": "botPost3Icon"}, + {"data": "botPost3Url"}, + {"data": "botPost3Text"}, + {"data": "botPost4Icon"}, + {"data": "botPost4Url"}, + {"data": "botPost4Text"}, + {"data": "botPost5Icon"}, + {"data": "botPost5Url"}, + {"data": "botPost5Text"} ], select: true, dom: "Bfrtip",