Merge commit '081d20bcbc6a523736bd9fc8a655338339fc4a29'

all.sql

@@ -3037,10 +3037,10 @@ CASE
 	END AS PRIORITY,
 	F.NAME
 FROM  app_visit_log_region as A
-	LEFT JOIN itm_app B on A.app_id=B.itm_app_id
-	LEFT JOIN ( SELECT VALUE, NAME FROM m_com_dict WHERE dict_index = 'itm_resources_netcode' ) C ON C.VALUE = B.ITM_NETGROUP_ID
-	LEFT JOIN pub_organ D ON D.id = A.ORGAN_ID
-	LEFT JOIN ( SELECT temp1.ITM_APP_ID, temp2.NAME FROM itm_app temp1 LEFT JOIN m_com_dict temp2 ON temp1.app_type = temp2.VALUE ) AS F ON A.app_id = F.itm_app_id 
+	inner JOIN itm_app B on A.app_id=B.itm_app_id
+	inner JOIN ( SELECT VALUE, NAME FROM m_com_dict WHERE dict_index = 'itm_resources_netcode' ) C ON C.VALUE = B.ITM_NETGROUP_ID
+	inner JOIN pub_organ D ON D.id = A.ORGAN_ID
+	inner JOIN ( SELECT temp1.ITM_APP_ID, temp2.NAME FROM itm_app temp1 LEFT JOIN m_com_dict temp2 ON temp1.app_type = temp2.VALUE ) AS F ON A.app_id = F.itm_app_id 
 GROUP BY
 	A.app_id,
 	A.ORGAN_ID,

fayuan_zp

@@ -643,7 +643,7 @@ FROM
 
 
 
-----基础设施应用告警----
+----应用系统告警趋势----
 
 DROP TABLE if EXISTS `bi_alm_yingyong_gaojing`;
 CREATE TABLE  `bi_alm_yingyong_gaojing`(
@@ -823,7 +823,7 @@ CREATE TABLE  `bi_alm_yingyong_yunxing`(
 	`app_type` varchar(10) DEFAULT NULL comment '应用分类',
 	`app_type_name` varchar(200) DEFAULT NULL comment '应用名称',
 	`vist_count` varchar(10) DEFAULT NULL COMMENT '访客数',
-	`slow_count` varchar(10) DEFAULT NULL COMMENT '漫操作量',
+	`slow_count` varchar(10) DEFAULT NULL COMMENT '慢操作量',
   `oper_count` varchar(10) DEFAULT NULL COMMENT '操作次数/访问量',
 	`resp_time` varchar(32) DEFAULT NULL COMMENT '响应时间',
 	`render_time` varchar(32) DEFAULT NULL COMMENT '渲染时间'