在bi_itm_hardware_resources, bi_hardware_fugai, bi_app_stat_group_by_time中增加cloud字段

all.sql

@@ -30,6 +30,7 @@ CREATE TABLE `bi_itm_hardware_resources` (
   `servicename` varchar(255) DEFAULT NULL COMMENT '服务app名',
   `relatedappid` varchar(255) DEFAULT NULL COMMENT '关联appid',
   `mantancevendor` varchar(255) DEFAULT NULL COMMENT '运维厂商',
+  `cloud` varchar(255) DEFAULT NULL COMMENT '云平台',
   KEY `bi_itm_hardware_resources_itm_hardware_resources_id_IDX` (`itm_hardware_resources_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
@@ -71,7 +72,8 @@ SELECT
 	case when IzGoY.itm_hardware_resources_type = '000100002' then Qfqdl.business_director else Qfqdl.yunweirenyuan end as yunweirenyuan,
 	Qfqdl.servicename,
 	Qfqdl.relatedappid,
-	case when IzGoY.itm_hardware_resources_type = '000100002' then Qfqdl.contractor else Qfqdl.mantancevendor end as mantancevendor
+	case when IzGoY.itm_hardware_resources_type = '000100002' then Qfqdl.contractor else Qfqdl.mantancevendor end as mantancevendor,
+	IzGoY.cloud
 FROM
 	itm_hardware_resources IzGoY
 LEFT JOIN
@@ -473,7 +475,8 @@ CREATE TABLE `bi_hardware_fugai` (
   `guoziguishurenyuan` varchar(255) DEFAULT NULL COMMENT '国资归属人员',
   `guoziguishubumen` varchar(255) DEFAULT NULL COMMENT '国资归属部门',
   `yunweirenyuan` varchar(255) DEFAULT NULL COMMENT '运维人员',
-  `ITM_HARDWARE_RESOURCES_NETNAME` varchar(100) DEFAULT NULL
+  `ITM_HARDWARE_RESOURCES_NETNAME` varchar(100) DEFAULT NULL,
+  `cloud` varchar(255) DEFAULT NULL COMMENT '云平台'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
@@ -482,7 +485,7 @@ insert into bi_hardware_fugai
 select 'MONTH' AS dtype, a.thedvalue, b.itm_hardware_resources_id,b.itm_hardware_resources_type,b.itm_hardware_resources_cntype,b.itm_hardware_resources_areacode,b.ITM_HARDWARE_RESOURCES_ASSNO,b.ITM_HARDWARE_RESOURCES_CODE
 	,b.ITM_HARDWARE_RESOURCES_NAME,b.ITM_HARDWARE_RESOURCES_IP,b.ITM_HARDWARE_RESOURCES_STATUS,b.itm_monitor_flag,b.create_time
 	,b.NAME,b.resclasscnname,b.UID,b.pinpai,b.xinghao,b.mac
-	,b.guoziguishurenyuan,b.guoziguishubumen,b.yunweirenyuan,b.NET_NAME as ITM_HARDWARE_RESOURCES_NETNAME  from (
+	,b.guoziguishurenyuan,b.guoziguishubumen,b.yunweirenyuan,b.NET_NAME as ITM_HARDWARE_RESOURCES_NETNAME,b.cloud  from (
 select distinct date_format(dt_d,'%Y%m') as thedvalue from bi_m_date where dt_d >= '2021-01-01' and dt_d < '2023-12-31') a
 left join bi_itm_hardware_resources b
 on a.thedvalue >= date_format(b.create_time,'%Y%m')
@@ -490,7 +493,7 @@ UNION ALL
 select 'YEAR' AS dtype, a.thedvalue, b.itm_hardware_resources_id,b.itm_hardware_resources_type,b.itm_hardware_resources_cntype,b.itm_hardware_resources_areacode,b.ITM_HARDWARE_RESOURCES_ASSNO,b.ITM_HARDWARE_RESOURCES_CODE
 	,b.ITM_HARDWARE_RESOURCES_NAME,b.ITM_HARDWARE_RESOURCES_IP,b.ITM_HARDWARE_RESOURCES_STATUS,b.itm_monitor_flag,b.create_time
 	,b.NAME,b.resclasscnname,b.UID,b.pinpai,b.xinghao,b.mac
-	,b.guoziguishurenyuan,b.guoziguishubumen,b.yunweirenyuan,b.NET_NAME as ITM_HARDWARE_RESOURCES_NETNAME  from (
+	,b.guoziguishurenyuan,b.guoziguishubumen,b.yunweirenyuan,b.NET_NAME as ITM_HARDWARE_RESOURCES_NETNAME,b.cloud  from (
 select distinct date_format(dt_d,'%Y') as thedvalue from bi_m_date where dt_d >= '2021-01-01' and dt_d < '2023-12-31') a
 left join bi_itm_hardware_resources b
 on a.thedvalue >= date_format(b.create_time,'%Y')
@@ -498,7 +501,7 @@ UNION ALL
 select 'DAY' AS dtype, a.thedvalue, b.itm_hardware_resources_id,b.itm_hardware_resources_type,b.itm_hardware_resources_cntype,b.itm_hardware_resources_areacode,b.ITM_HARDWARE_RESOURCES_ASSNO,b.ITM_HARDWARE_RESOURCES_CODE
 	,b.ITM_HARDWARE_RESOURCES_NAME,b.ITM_HARDWARE_RESOURCES_IP,b.ITM_HARDWARE_RESOURCES_STATUS,b.itm_monitor_flag,b.create_time
 	,b.NAME,b.resclasscnname,b.UID,b.pinpai,b.xinghao,b.mac
-	,b.guoziguishurenyuan,b.guoziguishubumen,b.yunweirenyuan,b.NET_NAME as ITM_HARDWARE_RESOURCES_NETNAME  from (
+	,b.guoziguishurenyuan,b.guoziguishubumen,b.yunweirenyuan,b.NET_NAME as ITM_HARDWARE_RESOURCES_NETNAME,b.cloud  from (
 select distinct date_format(dt_d,'%Y%m%d') as thedvalue from bi_m_date where dt_d >= '2021-01-01' and dt_d < '2023-12-31') a
 left join bi_itm_hardware_resources b
 on a.thedvalue >= date_format(b.create_time,'%Y%m%d');
@@ -556,6 +559,7 @@ CREATE TABLE `bi_app_stat_group_by_time` (
   `Device_total` decimal(38,4) DEFAULT NULL COMMENT '设备总量',
   `Device_used` decimal(38,4) DEFAULT NULL COMMENT '设备已用容量',
   `Device_UTILIZATION` decimal(38,4) DEFAULT NULL COMMENT '资源利用率',
+  `cloud` varchar(255) DEFAULT NULL COMMENT '云平台',
   KEY `bi_app_stat_group_by_time_dtype_IDX` (`dtype`,`thedvalue`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
@@ -597,7 +601,8 @@ begin
 		avg(IND_VALUE_Network_Ifoutrate) as network_Ifortrate,
 		0.0 as Device_total,
 		0.0 as Device_used,
-		0.0 as Device_UTILIZATION
+		0.0 as Device_UTILIZATION,
+		a.cloud
 	from bi_itm_hardware_resources a
 	inner join app_network_stat  b
 	on a.itm_hardware_resources_id = b.INT_ID
@@ -606,7 +611,7 @@ begin
 		a.itm_hardware_resources_id,a.itm_hardware_resources_type,a.itm_hardware_resources_cntype,case when a.NAME = '最高人民法院' then '最高' else '全国' end,a.itm_hardware_resources_areacode,
 		a.ITM_HARDWARE_RESOURCES_ASSNO,a.ITM_HARDWARE_RESOURCES_CODE,a.ITM_HARDWARE_RESOURCES_NAME,a.ITM_HARDWARE_RESOURCES_IP,a.ITM_HARDWARE_RESOURCES_STATUS,a.NET_NAME
 		,a.itm_monitor_flag,a.create_time,a.NAME,a.resclasscnname,a.UID,a.pinpai,a.xinghao,a.mac
-		,a.guoziguishurenyuan,a.guoziguishubumen,a.yunweirenyuan
+		,a.guoziguishurenyuan,a.guoziguishubumen,a.yunweirenyuan,a.cloud
 	union all
 	select 
 		'HOUR' as dtype,
@@ -630,7 +635,8 @@ begin
 		0.0 as network_Ifortrate,
 		max(IND_VALUE_HOST_DISK_TOTAL) as Device_total,
 		max(IND_VALUE_HOST_DISK_USED) as Device_used,
-		max(b.IND_VALUE_HOST_DISK_UTILIZATION) as Device_UTILIZATION
+		max(b.IND_VALUE_HOST_DISK_UTILIZATION) as Device_UTILIZATION,
+		a.cloud
 	from bi_itm_hardware_resources a
 	inner join app_host_stat  b
 	on a.itm_hardware_resources_id = b.INT_ID
@@ -639,7 +645,7 @@ begin
 		a.itm_hardware_resources_id,a.itm_hardware_resources_type,a.itm_hardware_resources_cntype,case when a.NAME = '最高人民法院' then '最高' else '全国' end,a.itm_hardware_resources_areacode,
 		a.ITM_HARDWARE_RESOURCES_ASSNO,a.ITM_HARDWARE_RESOURCES_CODE,a.ITM_HARDWARE_RESOURCES_NAME,a.ITM_HARDWARE_RESOURCES_IP,a.ITM_HARDWARE_RESOURCES_STATUS,a.NET_NAME
 		,a.itm_monitor_flag,a.CREATE_TIME,a.NAME,a.resclasscnname,a.UID,a.pinpai,a.xinghao,a.mac
-		,a.guoziguishurenyuan,a.guoziguishubumen,a.yunweirenyuan;
+		,a.guoziguishurenyuan,a.guoziguishubumen,a.yunweirenyuan,a.cloud;
 	
 	insert into bi_app_stat_group_by_time
 	select 
@@ -663,12 +669,13 @@ begin
 		avg(network_Ifortrate) as network_Ifortrate,
 		max(Device_total) as Device_total,
 		max(Device_used) as Device_used,
-		max(Device_UTILIZATION) as Device_UTILIZATION
+		max(Device_UTILIZATION) as Device_UTILIZATION,
+		cloud
 	from bi_app_stat_group_by_time
 	where dtype = 'HOUR' and thedvalue >= concat(bg_time,'00') and thedvalue < concat(ed_time,'00')
 	group by substr(thedvalue,1,8),dhour ,itm_hardware_resources_id ,itm_hardware_resources_type ,itm_hardware_resources_cntype ,QGorZG ,itm_hardware_resources_areacode ,
 		ITM_HARDWARE_RESOURCES_ASSNO ,ITM_HARDWARE_RESOURCES_CODE ,ITM_HARDWARE_RESOURCES_NAME ,ITM_HARDWARE_RESOURCES_IP ,ITM_HARDWARE_RESOURCES_STATUS ,
-		ITM_HARDWARE_RESOURCES_NETNAME ,itm_monitor_flag ,create_time ,NAME ,resclasscnname ,UID ,pinpai ,xinghao ,mac ,guoziguishurenyuan ,guoziguishubumen ,yunweirenyuan;
+		ITM_HARDWARE_RESOURCES_NETNAME ,itm_monitor_flag ,create_time ,NAME ,resclasscnname ,UID ,pinpai ,xinghao ,mac ,guoziguishurenyuan ,guoziguishubumen ,yunweirenyuan, cloud;
 	
 	insert into bi_app_stat_group_by_time
 	select 
@@ -692,12 +699,13 @@ begin
 		avg(network_Ifortrate) as network_Ifortrate,
 		max(Device_total) as Device_total,
 		max(Device_used) as Device_used,
-		max(Device_UTILIZATION) as Device_UTILIZATION
+		max(Device_UTILIZATION) as Device_UTILIZATION,
+		cloud
 	from bi_app_stat_group_by_time
 	where dtype = 'DAY' and thedvalue >= bg_time and thedvalue < ed_time
 	group by substr(thedvalue,1,6),dhour ,itm_hardware_resources_id ,itm_hardware_resources_type ,itm_hardware_resources_cntype ,QGorZG ,itm_hardware_resources_areacode ,
 		ITM_HARDWARE_RESOURCES_ASSNO ,ITM_HARDWARE_RESOURCES_CODE ,ITM_HARDWARE_RESOURCES_NAME ,ITM_HARDWARE_RESOURCES_IP ,ITM_HARDWARE_RESOURCES_STATUS ,
-		ITM_HARDWARE_RESOURCES_NETNAME ,itm_monitor_flag ,create_time ,NAME ,resclasscnname ,UID ,pinpai ,xinghao ,mac ,guoziguishurenyuan ,guoziguishubumen ,yunweirenyuan;
+		ITM_HARDWARE_RESOURCES_NETNAME ,itm_monitor_flag ,create_time ,NAME ,resclasscnname ,UID ,pinpai ,xinghao ,mac ,guoziguishurenyuan ,guoziguishubumen ,yunweirenyuan, cloud;
 	
 	insert into bi_app_stat_group_by_time
 	select 
@@ -721,12 +729,13 @@ begin
 		avg(network_Ifortrate) as network_Ifortrate,
 		max(Device_total) as Device_total,
 		max(Device_used) as Device_used,
-		max(Device_UTILIZATION) as Device_UTILIZATION
+		max(Device_UTILIZATION) as Device_UTILIZATION,
+		cloud
 	from bi_app_stat_group_by_time
 	where dtype = 'MONTH' and thedvalue >= date_format(STR_TO_DATE(bg_time,'%Y%m%d'),'%Y%m') and thedvalue <= date_format(DATE_ADD(STR_TO_DATE(ed_time,'%Y%m%d'), INTERVAL -1 day),'%Y%m')
 	group by substr(thedvalue,1,4),dhour ,itm_hardware_resources_id ,itm_hardware_resources_type ,itm_hardware_resources_cntype ,QGorZG ,itm_hardware_resources_areacode ,
 		ITM_HARDWARE_RESOURCES_ASSNO ,ITM_HARDWARE_RESOURCES_CODE ,ITM_HARDWARE_RESOURCES_NAME ,ITM_HARDWARE_RESOURCES_IP ,ITM_HARDWARE_RESOURCES_STATUS ,
-		ITM_HARDWARE_RESOURCES_NETNAME ,itm_monitor_flag ,create_time ,NAME ,resclasscnname ,UID ,pinpai ,xinghao ,mac ,guoziguishurenyuan ,guoziguishubumen ,yunweirenyuan;
+		ITM_HARDWARE_RESOURCES_NETNAME ,itm_monitor_flag ,create_time ,NAME ,resclasscnname ,UID ,pinpai ,xinghao ,mac ,guoziguishurenyuan ,guoziguishubumen ,yunweirenyuan, cloud;
 end $$
 delimiter ;
 
@@ -751,7 +760,7 @@ delimiter ;
 
 
 truncate table bi_save_tempbgtime;
-call wk_app_stat_group_by_time_xunhuan('20230711','20231130');
+call wk_app_stat_group_by_time_xunhuan('20230101','20231230');