diff --git a/db/init/galaxy_stru_ui_mysql.sql b/db/init/galaxy_stru_ui_mysql.sql index dfa681e..1d601e5 100644 --- a/db/init/galaxy_stru_ui_mysql.sql +++ b/db/init/galaxy_stru_ui_mysql.sql @@ -80,16 +80,19 @@ CREATE TABLE `ui_sys_dict_info` ( ) ENGINE=FEDERATED AUTO_INCREMENT=448 DEFAULT CHARSET=utf8 CONNECTION='mysql://root:111111@192.168.10.204:3306/gwall/sys_dict_info'; -CREATE TABLE `ui_code_app_dic` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `app_name` varchar(255) DEFAULT '', - `app_name_zh` varchar(255) DEFAULT NULL, - `view_code` varchar(255) DEFAULT '' COMMENT '应用编码', - `icon` varchar(255) DEFAULT '', - `behavior` varchar(255) DEFAULT '' COMMENT '行为细分', - `core_app` int(11) DEFAULT NULL COMMENT '是否是核心应用(1:是,0:否)', - PRIMARY KEY (`id`) - ) ENGINE=FEDERATED AUTO_INCREMENT=399 DEFAULT CHARSET=utf8 CONNECTION='mysql://root:111111@192.168.10.204:3306/gwall/code_app_dic'; + CREATE TABLE `ui_code_app_dic` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `app_name` varchar(255) CHARACTER SET utf8mb4 DEFAULT '', + `app_name_zh` varchar(255) CHARACTER SET utf8mb4 DEFAULT '', + `view_code` varchar(255) CHARACTER SET utf8mb4 DEFAULT '' COMMENT '应用编码', + `icon` varchar(255) DEFAULT '', + `behavior` varchar(255) CHARACTER SET utf8mb4 DEFAULT '' COMMENT '行为细分', + `core_app` int(11) DEFAULT NULL COMMENT '是否是核心应用(1:是,0:否)', + `app_service_id` int(10) unsigned zerofill DEFAULT NULL COMMENT '业务类型编号', + `app_service` varchar(255) CHARACTER SET utf8mb4 DEFAULT '', + `lib` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT 'lib类别', + PRIMARY KEY (`id`) + ) ENGINE=FEDERATED AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 CONNECTION='mysql://root:111111@192.168.10.204:3306/gwall/code_app_dic'; diff --git a/pom.xml b/pom.xml index 13263a7..96d3446 100644 --- a/pom.xml +++ b/pom.xml @@ -33,6 +33,41 @@ + + + + src/main/resources + + **/*.properties + **/*.xml + **/*.xsd + **/*.yml + + true + + + + src/main/resources + false + + **/*.mmdb + **/*.dat + **/*.sh + **/*.bat + **/*.sql + + + + + src/main/java + + **/*.properties + **/*.xml + + true + + + diff --git a/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml b/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml index ed61062..87d2ba7 100644 --- a/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml +++ b/src/main/java/com/nis/web/dao/dashboard/NtcTotalReportDao.xml @@ -12,30 +12,30 @@ --> + --> \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml index b806287..16f87af 100644 --- a/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml +++ b/src/main/java/com/nis/web/dao/dashboard/TrafficAppStatisticDao.xml @@ -17,10 +17,10 @@ diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml index 65d0a2c..9ddf1c9 100644 --- a/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml +++ b/src/main/java/com/nis/web/dao/dashboard/TrafficHttpStatisticDao.xml @@ -17,20 +17,20 @@ SELECT web_id webId,SUM(link_num) count - FROM galaxy.traffic_http_statistic t - LEFT JOIN galaxy.ui_website_domain_topic u ON t.web_id=u.id + FROM traffic_http_statistic t + LEFT JOIN ui_website_domain_topic u ON t.web_id=u.id where u.topic_id=#{topicId} and t.stat_time = #{statTime} GROUP BY t.web_id ORDER BY count desc limit 0,10 @@ -71,8 +71,8 @@ - SELECT MAX(stat_time) statTime FROM galaxy.traffic_ip_active_statistic + SELECT MAX(stat_time) statTime FROM traffic_ip_active_statistic @@ -48,7 +48,7 @@ - SELECT MAX(stat_time) statTime FROM galaxy.traffic_port_active_statistic + SELECT MAX(stat_time) statTime FROM traffic_port_active_statistic diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficProtocolStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/TrafficProtocolStatisticDao.xml index 3b6572a..2018481 100644 --- a/src/main/java/com/nis/web/dao/dashboard/TrafficProtocolStatisticDao.xml +++ b/src/main/java/com/nis/web/dao/dashboard/TrafficProtocolStatisticDao.xml @@ -17,10 +17,10 @@ \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.xml index f3e2b6c..42dce7d 100644 --- a/src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.xml +++ b/src/main/java/com/nis/web/dao/dashboard/TrafficUaStatisticDao.xml @@ -18,29 +18,29 @@ - SELECT bs_type bsType, SUM(link_num) count FROM galaxy.traffic_ua_statistic + SELECT bs_type bsType, SUM(link_num) count FROM traffic_ua_statistic WHERE bs_type !=0 and stat_time = #{statTime} GROUP BY bs_type ORDER BY count DESC limit 0,10