智能分析平台代码备份

0483eed8 · 胡斌 · 25f5709d · 0483eed8 · 0483eed8 · 0483eed8
Commit 0483eed8 authored Dec 09, 2017 by 胡斌
18 changed files
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
--- a/src/main/java/com/hp/cmsz/entity/XcdWarningInfoView.java
+++ b/src/main/java/com/hp/cmsz/entity/XcdWarningInfoView.java
@@ -55,6 +55,7 @@ public class XcdWarningInfoView {
 	private String status;//关闭类型(未关闭,。。。。)
    private String workingOrderCode;
    private String riskPictureFileName; //隐患图片
+    private String influenceEndTime; //隐患图片
    private Long dataModelTypeId;
    private String dataModelName;
@@ -278,4 +279,11 @@ public class XcdWarningInfoView {
 		this.riskEarlyWarningTypeName = riskEarlyWarningTypeName;
 	}
+	public String getInfluenceEndTime() {
+		return influenceEndTime;
+	}
+	public void setInfluenceEndTime(String influenceEndTime) {
+		this.influenceEndTime = influenceEndTime;
+	}
 }
--- a/src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java
+++ b/src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java
@@ -121,9 +121,20 @@ public class RunTask {
 	private String			frequencyValue;
+	private String			evaluationResult;
 	@Transient
 	private Long			defaultTaskType;
+	public String getEvaluationResult() {
+		return evaluationResult;
+	}
+	public void setEvaluationResult(String evaluationResult) {
+		this.evaluationResult = evaluationResult;
+	}
 	public Long getTaskId() {
 		return taskId;
 	}

--- a/src/main/java/com/hp/cmsz/web/PageURLController.java
+++ b/src/main/java/com/hp/cmsz/web/PageURLController.java
@@ -43,6 +43,10 @@ public class PageURLController {
 	//ImgDisplay映射到WEB-INF/views下的MonitorOperation/ImgDisplay.jsp页面
 	public static String ImgDisplay="MonitorOperation/ImgDisplay";
+	//模型监控下的预览图片展示
+	//ImgDisplay映射到WEB-INF/views下的MonitorOperation/ImgDisplay.jsp页面
+	public static String RunTaskImgDisplay="TaskManage/ImgDisplay";
 	//监控运营下的告警分析
 	//WarnAnalysis映射到WEB-INF/views下的MonitorOperation/WarnAnalysis.jsp页面
 	public static String WarnAnalysis="MonitorOperation/WarnAnalysis";

--- a/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java
+++ b/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java
@@ -14,8 +14,10 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.text.ParseException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import com.hp.cmsz.entity.commonmanage.RunTaskDetail;
 import com.hp.cmsz.entity.*;
@@ -409,5 +411,8 @@ public class TaskManageController {
    }
+    @RequestMapping(value = "/ImgDisplay*", method = RequestMethod.GET)
+    public String ImgDisplay(Map model) throws ParseException {
+        return PageURLController.RunTaskImgDisplay;
+    }
 }
\ No newline at end of file
--- a/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/ModelParameter.class
+++ b/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/ModelParameter.class
--- a/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/XcdWarningInfoView.class
+++ b/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/XcdWarningInfoView.class
--- a/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/commonmanage/RunTask.class
+++ b/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/commonmanage/RunTask.class
--- a/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ModelParameterDao.class
+++ b/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ModelParameterDao.class
--- a/src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/modelmanage/ModelParameterService.class
+++ b/src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/modelmanage/ModelParameterService.class
--- a/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/modelmanage/ModelMaintainController.class
+++ b/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/modelmanage/ModelMaintainController.class
--- a/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.class
+++ b/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.class
--- a/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp
+++ b/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp
@@ -85,6 +85,8 @@
        document.getElementById("taskManageFrame").src='${ctx}'+"/BaseManage/TaskManage/taskFormFrame?defaultTaskType="+taskType+"&taskId=" + id+"&type=modify";
    }
    function OpenDialog(data,id,taskType) {
        var df=new SimpleDateFormat();
        df.applyPattern("yyyy-MM-dd HH:mm:ss");
@@ -141,7 +143,7 @@
            "    <tr>" +
            "        <td colspan='8'>" +
            "            <div class=''>" +
-            "                <img src='${ctx}/BaseManage/TaskManage/modelPreviewImg?path="+data.fileAddress+"'/>" +
+            "                <a src='${ctx}/BaseManage/TaskManage/ImgDisplay?${ctx}/BaseManage/TaskManage/modelPreviewImg?path="+data.fileAddress+"'><img id='img' src='${ctx}/BaseManage/TaskManage/modelPreviewImg?path="+data.fileAddress+"'/></a>" +
            "            </div>" +
            "        </td>" +
            "    </tr>" +

--- a/src/main/webapp/WEB-INF/views/TaskManage/RunTaskImage.jsp
+++ b/src/main/webapp/WEB-INF/views/TaskManage/RunTaskImage.jsp
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags"%>
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="en">
+<head>
+    <title>全网监控智能分析平台</title>
+    <link href="${ctx}/static/nvd3/nv.d3.css" rel="stylesheet" type="text/css" />
+    <script src="${ctx}/static/nvd3/lib/d3.v3.js"></script>
+    <script src="${ctx}/static/nvd3/nv.d3.js"></script>
+    <style type="text/css">
+        .tab-content{
+            text-align:center;
+        }
+        .container {
+            min-width: 1300px;
+        }
+    </style>
+</head>
+<body>
+<div>
+    <div class="container">
+        <ol class="breadcrumb">
+            <li><a href="${ctx}/index">首页</a></li>
+            <li>模型监控</li>
+            <li class="active">图片展示</li>
+        </ol>
+    </div>
+</div>
+<div id="main-container main-tab-container">
+    <div id="content" class="container">
+        <div class="tab-bar-bt">
+            <ul class="nav nav-tabs"></ul>
+        </div>
+        <div class="section">
+            <div class="tab-content">
+                <div class="tab-pane fade in active" id="home">
+                    <div class="row me-row">
+                        <div id="slidePushMenus" class="cbp-spmenu-push">
+                            <div class="main col-xs-12">
+                                <div class="content clearfix">
+                                    <div class="block clearfix">
+                                        <div class="tab-content">
+                                            <img id="img" src="${ctx}/static/images/loading.gif"/>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script type="text/javascript">
+    var src=window.location.href.split('?')[1];
+    $("#img").attr("src",src);
+</script>
+</body>
+</html>
\ No newline at end of file
--- a/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp
+++ b/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp
@@ -137,11 +137,16 @@ taskName = "自定义任务";
 	function preview(e){
        var id = $('input[name="taskId"]:checked').val();
        var taskType = '${queryCondition.defaultTaskType}';
+        <%--${ctx}/static/images/loading.gif--%>
+		$("#loading").show();
        $.ajax({
            type : 'GET',
            'url' : '${ctx}/BaseManage/TaskManage/modelPreview?id='+id,
            data : "",
            success : function(data) {
+                $("#loading").hide();
                parent.OpenDialog(data,id,taskType);
            }
        });
@@ -170,6 +175,10 @@ taskName = "自定义任务";
 	<div id="main-tab-container">
 		<div id="content">
 			<div class="section" height="100%" style="overflow: visible">
+				<div id="loading" style="display:none;z-index:998;width: 100%;height: 100%;position: absolute;background-color:#000;background: rgba(0, 0, 0, 0.5);" class="loader-inner ball-spin-fade-loader">
+					<img style="position: absolute;left: 45%;top:30%" src="${ctx}/static/images/loading.gif">
+				</div>
 				<div class="tab-content">
 					<div class="row me-row">
 						<div id="slidePushMenus" class="cbp-spmenu-push">
@@ -266,6 +275,7 @@ taskName = "自定义任务";
 							</div>
 						</div>
 					</div>
 				</div>
 			</div>
 		</div>

--- a/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp
+++ b/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp
@@ -27,6 +27,7 @@
 					<th>渠道</th>
 					<th>业务名称</th>
 					<th>指标名称</th>
+					<th>模型评价</th>
 				</c:if>
 				<th>任务名称</th>
 				<th>任务类型</th>
@@ -49,6 +50,7 @@
 						<td>${runTask.channelView.channelName}</td>
 						<td>${runTask.businessView.businessName}</td>
 						<td>${runTask.dimKpiView.name}</td>
+						<td>${runTask.evaluationResult}</td>
 					</c:if>
 					<td>${runTask.name}</td>
 					<td>

--- a/src/main/webapp/static/js/filterResultDetailTable.js
+++ b/src/main/webapp/static/js/filterResultDetailTable.js
@@ -338,10 +338,7 @@ table_pagging.prototype = {
 										}else{
                                            tdContext = value+unit;
 										}
                                    }
 								}
 							} else {

--- a/src/main/webapp/static/js/xcdWarningTable.js
+++ b/src/main/webapp/static/js/xcdWarningTable.js
@@ -141,9 +141,9 @@ function xcdFindWarningTable() {
 //		    	  header[8] = ["指标名称","kpiName","5%",""];
 		    	  header[8] = ["告警类型","riskEarlyWarningTypeName","6%","6"];
 //		    	  header[10] = ["配置项名称","ciName","5%",""];
-		    	  header[9] = ["集成商","providerName","6%","4"];
+		    	  header[9] = ["级别","importanceLevelName","4%","4"];
-		    	  header[10] = ["级别","importanceLevelName","4%","4"];
+		    	  header[10] = ["发生时间","occurTime","7%",""];
-		    	  header[11] = ["发生时间","occurTime","7%",""];
+		    	  header[11] = ["告警影响结束时间","influenceEndTime","7%",""];
 		    	  header[12] = ["结束时间","closeTime","7%",""];
 		    	  header[13] = ["协查单号","workingOrderCode","6%",""];
 		    	  header[14] = ["故障单号","relevantFailureId","6%",""];