Index: .idea/sonarIssues.xml =================================================================== diff -u -r17e125daa69136e50a0fdccae40a7b94c11ac91b -r24324f07809f2da4099c98e98327a32c9a4329cd --- .idea/sonarIssues.xml (.../sonarIssues.xml) (revision 17e125daa69136e50a0fdccae40a7b94c11ac91b) +++ .idea/sonarIssues.xml (.../sonarIssues.xml) (revision 24324f07809f2da4099c98e98327a32c9a4329cd) @@ -918,6 +918,11 @@ + + + + + @@ -968,6 +973,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: standard/project/web/script/ddl/oracle/egovframework/api/rivalWar/menu/Menu_DDL_Oracle.sql =================================================================== diff -u -r6b8c4d7b039335012a2a19df87003435e1255391 -r24324f07809f2da4099c98e98327a32c9a4329cd --- standard/project/web/script/ddl/oracle/egovframework/api/rivalWar/menu/Menu_DDL_Oracle.sql (.../Menu_DDL_Oracle.sql) (revision 6b8c4d7b039335012a2a19df87003435e1255391) +++ standard/project/web/script/ddl/oracle/egovframework/api/rivalWar/menu/Menu_DDL_Oracle.sql (.../Menu_DDL_Oracle.sql) (revision 24324f07809f2da4099c98e98327a32c9a4329cd) @@ -45,7 +45,8 @@ C_TYPE VARCHAR2(4000 BYTE), C_VOTE_START_DATE VARCHAR2(4000 BYTE), - C_VOTE_END_DATE VARCHAR2(4000 BYTE), + C_VOTE_END_DATE VARCHAR2(4000 BYTE), + AGGREGATE_RESULT_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 @@ -64,6 +65,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 '누적집계 결과 아이디'; /* * 인덱스는 되도록 걸지 말것. * CREATE UNIQUE INDEX I_COMPREHENSIVETREE ON T_JSTREE_MENU Index: standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/vo/AggregateResultDTO.java =================================================================== diff -u -r638758f42b8e7b63fd338ad56077358561c8cfc0 -r24324f07809f2da4099c98e98327a32c9a4329cd --- standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/vo/AggregateResultDTO.java (.../AggregateResultDTO.java) (revision 638758f42b8e7b63fd338ad56077358561c8cfc0) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/vo/AggregateResultDTO.java (.../AggregateResultDTO.java) (revision 24324f07809f2da4099c98e98327a32c9a4329cd) @@ -53,12 +53,18 @@ this.copyBooleanValue = copyBooleanValue; } - //우위 스펙 갯수: 6 좋아요 획득 갯수 : 3133
총 등록 글 : 10,490 총 등록된 해시 태그 : 4300 + //우위 스펙 갯수: 6, 좋아요 획득 갯수 : 3133,총 등록 글 : 10,490, 총 등록된 해시 태그 : 4300 private Long numberOfAdvantages; private Long likeCount; private Long totalRegisteredPosts; private Long registeredHashTag; + //graph percent: 15%, score point: 21304 point, + //Total Traffic : 24 541, Unique Visits : 14 778, Revenue : $3 583.18, Total Sales : $59 871.12 + + //등록된 글 총합: 19,23 좋아요 선택 총합: 2,443(21.2%) 추가된 스펙개수: 7개 등록된 해시태그 총합: 13,233개 + // 표준오차: 64821, 등분상 가정 유의확률: 124 유의확률: 823, 99% 신뢰구간 하한: -23134 상한: 235421 T분포결과: 8.423 + @Column(name = "c_number_of_advantages") public Long getNumberOfAdvantages() { return numberOfAdvantages; Index: standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/controller/AdminCompareInfoController.java =================================================================== diff -u --- standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/controller/AdminCompareInfoController.java (revision 0) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/controller/AdminCompareInfoController.java (revision 24324f07809f2da4099c98e98327a32c9a4329cd) @@ -0,0 +1,7 @@ +package egovframework.api.rivalWar.compareInfo.controller; + +/** + * Created by Administrator on 2017-09-03. + */ +public class AdminCompareInfoController { +} Index: standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/controller/AnonymousCompareInfoController.java =================================================================== diff -u --- standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/controller/AnonymousCompareInfoController.java (revision 0) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/controller/AnonymousCompareInfoController.java (revision 24324f07809f2da4099c98e98327a32c9a4329cd) @@ -0,0 +1,7 @@ +package egovframework.api.rivalWar.compareInfo.controller; + +/** + * Created by Administrator on 2017-09-03. + */ +public class AnonymousCompareInfoController { +} Index: standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/controller/UserCompareInfoController.java =================================================================== diff -u --- standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/controller/UserCompareInfoController.java (revision 0) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/controller/UserCompareInfoController.java (revision 24324f07809f2da4099c98e98327a32c9a4329cd) @@ -0,0 +1,7 @@ +package egovframework.api.rivalWar.compareInfo.controller; + +/** + * Created by Administrator on 2017-09-03. + */ +public class UserCompareInfoController { +} Index: standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/service/CompareInfoService.java =================================================================== diff -u --- standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/service/CompareInfoService.java (revision 0) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/service/CompareInfoService.java (revision 24324f07809f2da4099c98e98327a32c9a4329cd) @@ -0,0 +1,7 @@ +package egovframework.api.rivalWar.compareInfo.service; + +/** + * Created by Administrator on 2017-09-03. + */ +public class CompareInfoService { +} Index: standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/service/CompareInfoServiceImpl.java =================================================================== diff -u --- standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/service/CompareInfoServiceImpl.java (revision 0) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/service/CompareInfoServiceImpl.java (revision 24324f07809f2da4099c98e98327a32c9a4329cd) @@ -0,0 +1,7 @@ +package egovframework.api.rivalWar.compareInfo.service; + +/** + * Created by Administrator on 2017-09-03. + */ +public class CompareInfoServiceImpl { +} Index: standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/vo/CompareInfoDTO.java =================================================================== diff -u --- standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/vo/CompareInfoDTO.java (revision 0) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/vo/CompareInfoDTO.java (revision 24324f07809f2da4099c98e98327a32c9a4329cd) @@ -0,0 +1,7 @@ +package egovframework.api.rivalWar.compareInfo.vo; + +/** + * Created by Administrator on 2017-09-03. + */ +public class CompareInfoDTO { +} Index: standard/project/web/src/main/java/egovframework/api/rivalWar/menu/vo/MenuDTO.java =================================================================== diff -u -r17e125daa69136e50a0fdccae40a7b94c11ac91b -r24324f07809f2da4099c98e98327a32c9a4329cd --- standard/project/web/src/main/java/egovframework/api/rivalWar/menu/vo/MenuDTO.java (.../MenuDTO.java) (revision 17e125daa69136e50a0fdccae40a7b94c11ac91b) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/menu/vo/MenuDTO.java (.../MenuDTO.java) (revision 24324f07809f2da4099c98e98327a32c9a4329cd) @@ -6,6 +6,7 @@ import org.hibernate.annotations.*; import javax.persistence.*; +import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.Table; import java.io.Serializable; @@ -79,9 +80,15 @@ } } - @MapsId - @OneToOne - @JoinColumn(name = "c_id") - AggregateResultDTO aggregateResultDTO; + private AggregateResultDTO aggregateResultDTO; + @OneToOne(cascade = CascadeType.ALL) + @JoinColumn(name = "AGGREGATE_RESULT_ID") + public AggregateResultDTO getAggregateResultDTO() { + return aggregateResultDTO; + } + + public void setAggregateResultDTO(AggregateResultDTO aggregateResultDTO) { + this.aggregateResultDTO = aggregateResultDTO; + } }