Index: web-module/pom.xml =================================================================== diff -u -ra48d7fdf2aada9e56373ce266683e3f5d3d69f9b -r7057cf335f0376ed0659df449bcacae43d01f2b6 --- web-module/pom.xml (.../pom.xml) (revision a48d7fdf2aada9e56373ce266683e3f5d3d69f9b) +++ web-module/pom.xml (.../pom.xml) (revision 7057cf335f0376ed0659df449bcacae43d01f2b6) @@ -104,48 +104,6 @@ 3.1.1 - scoutercopy - package - - copy - - - - - 313devgrp - scouter - 2.8.1 - jar - false - ${project.build.directory} - scouter.jar - - - - - - - scouterconfcopy - package - - copy - - - - - 313devgrp - scouter - 3.1.3 - conf - false - ${project.build.directory} - scouter.conf - - - - - - unpack generate-resources @@ -274,8 +232,6 @@ web.war - scouter.jar - scouter.conf Index: web-module/script/ddl/oracle/egovframework/api/ArmsDeviceList_DDL_Oracle.sql =================================================================== diff -u --- web-module/script/ddl/oracle/egovframework/api/ArmsDeviceList_DDL_Oracle.sql (revision 0) +++ web-module/script/ddl/oracle/egovframework/api/ArmsDeviceList_DDL_Oracle.sql (revision 7057cf335f0376ed0659df449bcacae43d01f2b6) @@ -0,0 +1,110 @@ +CREATE TABLE T_ARMS_MONITOR_DEVICELIST_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_ARMS_MONITOR_DEVICELIST_LOG IS '기본 트리 스키마 트리거 로그'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST_LOG.C_ID IS '노드 아이디'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST_LOG.C_PARENTID IS '부모 노드 아이디'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST_LOG.C_POSITION IS '노드 포지션'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST_LOG.C_LEFT IS '노드 좌측 끝 포인트'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST_LOG.C_RIGHT IS '노드 우측 끝 포인트'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST_LOG.C_LEVEL IS '노드 DEPTH '; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST_LOG.C_TITLE IS '노드 명'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST_LOG.C_TYPE IS '노드 타입'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST_LOG.C_METHOD IS '노드 변경 행위'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST_LOG.C_STATE IS '노드 상태값 ( 이전인지. 이후인지)'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST_LOG.C_DATE IS '노드 변경 시'; + +CREATE TABLE T_ARMS_MONITOR_DEVICELIST +( + 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_LINK VARCHAR2(4000 BYTE), + + c_monitor_name VARCHAR2(4000 BYTE), + c_monitor_url_filebeat VARCHAR2(4000 BYTE), + c_monitor_url_packetbeat VARCHAR2(4000 BYTE), + c_monitor_url_heartbeat VARCHAR2(4000 BYTE), + c_monitor_url_metricbeat VARCHAR2(4000 BYTE), + c_monitor_url_topbeat VARCHAR2(4000 BYTE), + c_monitor_url_apm VARCHAR2(4000 BYTE), + c_monitor_url_scouter VARCHAR2(4000 BYTE), + + CONSTRAINT T_ARMS_MONITOR_DEVICELISTU_PK PRIMARY KEY (C_ID) +); + +COMMENT ON TABLE T_ARMS_MONITOR_DEVICELIST IS '기본 트리 스키마'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST.C_ID IS '노드 아이디'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST.C_PARENTID IS '부모 노드 아이디'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST.C_POSITION IS '노드 포지션'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST.C_LEFT IS '노드 좌측 끝 포인트'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST.C_RIGHT IS '노드 우측 끝 포인트'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST.C_LEVEL IS '노드 DEPTH '; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST.C_TITLE IS '노드 명'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST.C_TYPE IS '노드 타입'; + +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST.c_monitor_name IS '모니터링 이름'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST.c_monitor_url_filebeat IS '파일비트 로그 접속 주소'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST.c_monitor_url_packetbeat IS '패킷비트 로그 접속 주소'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST.c_monitor_url_heartbeat IS '하트비트 로그 접속 주소'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST.c_monitor_url_metricbeat IS '메트릭비트 로그 접속 주소'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST.c_monitor_url_topbeat IS '탑비트 로그 접속 주소'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST.c_monitor_url_apm IS '성능 모니터링 접속 주소'; +COMMENT ON COLUMN T_ARMS_MONITOR_DEVICELIST.c_monitor_url_scouter IS '스카우터 모니터링 접속 주소'; + + +CREATE SEQUENCE S_ARMS_MONITOR_DEVICELIST + START WITH 10 + MAXVALUE 999999999999999999999999999 + MINVALUE 0 + NOCYCLE + CACHE 20 + NOORDER; + + +CREATE OR REPLACE TRIGGER "TG_ARMS_MONITOR_DEVICELIST" +BEFORE DELETE OR INSERT OR UPDATE +ON T_ARMS_MONITOR_DEVICELIST_LOG +REFERENCING NEW AS NEW OLD AS OLD +FOR EACH ROW +DECLARE +tmpVar NUMBER; +BEGIN + tmpVar := 0; + IF UPDATING THEN + insert into T_ARMS_MONITOR_DEVICELIST_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_ARMS_MONITOR_DEVICELIST_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_ARMS_MONITOR_DEVICELIST_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_ARMS_MONITOR_DEVICELIST_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 + RAISE; +END TG_ARMS_MONITOR_DEVICELIST; \ No newline at end of file Index: web-module/src/main/java/egovframework/api/armsmonitor/service/DeviceListService.java =================================================================== diff -u -r6780c7872fe2a4fc1857a601495dc5f6529057cd -r7057cf335f0376ed0659df449bcacae43d01f2b6 --- web-module/src/main/java/egovframework/api/armsmonitor/service/DeviceListService.java (.../DeviceListService.java) (revision 6780c7872fe2a4fc1857a601495dc5f6529057cd) +++ web-module/src/main/java/egovframework/api/armsmonitor/service/DeviceListService.java (.../DeviceListService.java) (revision 7057cf335f0376ed0659df449bcacae43d01f2b6) @@ -1,7 +1,9 @@ package egovframework.api.armsmonitor.service; +import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateService; + /** * Created by Administrator on 2020-11-08. */ -public class DeviceListService { +public interface DeviceListService extends JsTreeHibernateService { } Index: web-module/src/main/java/egovframework/api/armsmonitor/service/DeviceListServiceImpl.java =================================================================== diff -u -r6780c7872fe2a4fc1857a601495dc5f6529057cd -r7057cf335f0376ed0659df449bcacae43d01f2b6 --- web-module/src/main/java/egovframework/api/armsmonitor/service/DeviceListServiceImpl.java (.../DeviceListServiceImpl.java) (revision 6780c7872fe2a4fc1857a601495dc5f6529057cd) +++ web-module/src/main/java/egovframework/api/armsmonitor/service/DeviceListServiceImpl.java (.../DeviceListServiceImpl.java) (revision 7057cf335f0376ed0659df449bcacae43d01f2b6) @@ -1,7 +1,12 @@ package egovframework.api.armsmonitor.service; +import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateServiceImpl; +import org.springframework.stereotype.Service; + /** * Created by Administrator on 2020-11-08. */ -public class DeviceListServiceImpl { +@Service("DeviceListService") +public class DeviceListServiceImpl extends JsTreeHibernateServiceImpl implements DeviceListService{ + } Index: web-module/src/main/java/egovframework/api/armsmonitor/vo/DeviceListDTO.java =================================================================== diff -u -r6780c7872fe2a4fc1857a601495dc5f6529057cd -r7057cf335f0376ed0659df449bcacae43d01f2b6 --- web-module/src/main/java/egovframework/api/armsmonitor/vo/DeviceListDTO.java (.../DeviceListDTO.java) (revision 6780c7872fe2a4fc1857a601495dc5f6529057cd) +++ web-module/src/main/java/egovframework/api/armsmonitor/vo/DeviceListDTO.java (.../DeviceListDTO.java) (revision 7057cf335f0376ed0659df449bcacae43d01f2b6) @@ -29,17 +29,21 @@ } @Getter @Setter - private String c_monitor_source_name; + private String c_monitor_name; @Getter @Setter - private String c_monitor_url_cpu; + private String c_monitor_url_filebeat; @Getter @Setter - private String c_monitor_url_memory; + private String c_monitor_url_packetbeat; @Getter @Setter - private String c_monitor_url_disk; + private String c_monitor_url_heartbeat; @Getter @Setter - private String c_monitor_url_application; + private String c_monitor_url_metricbeat; @Getter @Setter - private String c_monitor_url_log; + private String c_monitor_url_topbeat; + @Getter @Setter + private String c_monitor_url_apm; + @Getter @Setter + private String c_monitor_url_scouter; @Override public void setFieldFromNewInstance(T paramInstance) {