Skip to content

C
cmszMonitorAnalysis
Commit 73a3469e authored by liuna's avatar liuna
Browse files
Options

2018年1月15日 --智能分析平台

--修改过滤规则验收新问题
parent db8a15a3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 25 deletions
.idea/workspace.xml
View file @ 73a3469e
This diff is collapsed.
CmszMonitorAnalysis.iml
View file @ 73a3469e
This diff is collapsed.
src/main/java/com/hp/cmsz/web/PageURLController.java
View file @ 73a3469e
......@@ -149,7 +149,8 @@ public class PageURLController {
//WorkingOrderManage映射到WEB-INF/views下的MonitorOperation/WorkingOrderUpdate.jsp页面
public static String InsideXcd="MonitorOperation/InsideXcd";
//数据预分析下实体厅流量监测分析
public static String FlowMonitor="MonitorOperation/FlowMonitor";
......
src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleResultController.java
View file @ 73a3469e
......@@ -103,7 +103,7 @@ public class FilterRuleResultController {
@RequestMapping(value = "queryRule")
@ResponseBody
public List<FilterRule> queryRule(
public void queryRule(
String provinceArr,
String businessArr,
String isRepeat,
......@@ -159,15 +159,6 @@ public class FilterRuleResultController {
// Timestamp time1 = Timestamp.valueOf(startTime);
// Timestamp time2 = Timestamp.valueOf(endTime);
return filterRuleList;
}
......
src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java
View file @ 73a3469e
......@@ -162,7 +162,7 @@ public class QualityRuleResultController {
//删掉质量规则
@RequestMapping(value = "/deleteOneRule*",method = RequestMethod.GET)
public String deleteRule(
public void deleteRule(
@RequestParam(value = "qualityRuleId") String qualityRuleId,
HttpServletResponse response){
......@@ -189,7 +189,6 @@ public class QualityRuleResultController {
// accuracyRuleDao.delete(accuracyRuleList);
cmszOperationLogService.createLog("删除","更新质量规则","quality_rule_warehouse_info_t. QUALITY_RULE_ID="+qualityRuleId);
return PageURLController.RuleResult;
}
//查看准确性规则内容
......
src/main/java/com/hp/cmsz/web/monitoroperation/FlowMonitorController.java 0 → 100644
View file @ 73a3469e
package com.hp.cmsz.web.monitoroperation;
import com.google.gson.Gson;
import com.hp.cmsz.entity.Province;
import com.hp.cmsz.repository.ProvinceDao;
import com.hp.cmsz.web.PageURLController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import java.util.List;
import java.util.Map;
/**
* 实体厅流量监测分析
*
*
*
*/
@Controller
@RequestMapping(value = "MonitorOperation/FlowMonitor")
public class FlowMonitorController {
@Autowired
private ProvinceDao provinceDao;
@RequestMapping(method = RequestMethod.GET)
public String FlowMonitor(Map model) {
//查询出所有省份的信息
List<Province> provinceList=(List<Province>)provinceDao.findAll();
Gson gson = new Gson();
model.put("provinceList", provinceList);
return PageURLController.FlowMonitor;
}
}
src/main/webapp/WEB-INF/layouts/header.jsp
View file @ 73a3469e
......@@ -114,6 +114,7 @@
<ul class="dropdown-menu">
<li><a href="${ctx}/MonitorOperation/RegularityAnalysis">数据特征探查</a></li>
<li><a href="${ctx}/MonitorOperation/KeyLinkProcessAnalysis">业务环节分析</a></li>
<li><a href="${ctx}/MonitorOperation/FlowMonitor">实体厅流量监测分析</a></li>
</ul>
</li>
</shiro:hasPermission>
......
src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp
View file @ 73a3469e
......@@ -54,8 +54,9 @@
<table id="filterMaintainTable" class="table-null">
<tr><td>省份（<font color="red">必填</font>）：</td>
<td><div style="width: 50%">
<div class="checkbox-inline"><label><input type="checkbox" id="allProvince" name="allProvince" checked>全选</label></div><br/>
<c:forEach var="province" items="${provinceList}">
<input type="checkbox" name="province" value="${province.provinceId}" checked>${province.provinceName}
<input type="checkbox" name="province" class="province" value="${province.provinceId}" checked>${province.provinceName}
</c:forEach>
</div></td>
......@@ -87,12 +88,14 @@
</tr>
<tr><td>业务（<font color="red">必填</font>）：</td>
<td >
<div class="checkbox-inline"><label><input type="checkbox" id="allBusiness" name="allBusiness" checked>全选</label></div><br/>
<div id="businesstd" style="width: 50%"></div>
</td>
</tr>
<tr><td>指标（<font color="red">必填</font>）：</td>
<td>
<div class="checkbox-inline"><label><input type="checkbox" id="allKpi" name="allKpi" checked>全选</label></div><br/>
<div id="kpitd" style="width: 50%"></div>
</td>
......@@ -391,5 +394,30 @@
}
})
//省份全选
$("#allProvince").click(function(){
if($("#allProvince").attr("checked") == "checked"){//全选
$(".province").attr("checked","checked");
}else{//不全选
$(".province").attr("checked",false);
}
});
//业务全选
$("#allBusiness").click(function(){
if($("#allBusiness").attr("checked") == "checked"){//全选
$(".businessItem").attr("checked","checked");
}else{//不全选
$(".businessItem").attr("checked",false);
}
});
//指标全选
$("#allKpi").click(function(){
if($("#allKpi").attr("checked") == "checked"){//全选
$(".kpiItem").attr("checked","checked");
}else{//不全选
$(".kpiItem").attr("checked",false);
}
});
</script>
</body>
src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp
View file @ 73a3469e
......@@ -197,6 +197,13 @@
});
$("#deleteFilter").click(function(){
var provinceArr ="";
$("[name='province']:checked").each(function () {
provinceArr+=$(this).val()+","
});
provinceArr = provinceArr.substring(0,provinceArr.length-1);
var businessArr = getStatsBusinessCheckedValuesString();
var isRepeat = $('#isRepeatSelect').val();
var filterRuleId = $("input[name='checkbox']:checked");
var id ="";
filterRuleId.each(function () {
......@@ -217,7 +224,19 @@
dataType : "json",
success: function(data){
if(data.status === "success"){
location.href = "${ctx}/AnalysisSupport/FilterRuleResult"
$.ajax({
type : 'GET',
contentType : 'application/json',
url: "${ctx}/AnalysisSupport/FilterRuleResult/queryRule?provinceArr="+provinceArr+ "&businessArr="+businessArr+ "&isRepeat="+isRepeat,
dataType : 'text',
async: false,
beforeSend: function(data) {
},
success: function(data) {
$("#filterRuleView").val(data);
filterResultDetailTable();
}
});
}
}
......
src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp
View file @ 73a3469e
......@@ -215,6 +215,10 @@ $("#updateRule").click(function(){
});
$("#deleteRule").click(function(){
var dataSource=getStatsDataSourceCheckedValuesString();
var chnnal=getStatsChannelCheckedValuesString();
var bussines=getStatsBusinessCheckedValuesString();
var code=$.trim(document.getElementById("kpiCodeID").value);
var qualityRuleId = $("input[name='checkbox']:checked");
var id ="";
qualityRuleId.each(function () {
......@@ -230,7 +234,19 @@ $("#deleteRule").click(function(){
type: 'get',
url: "${ctx}/AnalysisSupport/QualityRuleResult/deleteOneRule?qualityRuleId="+id,
success:function(){
window.location.href="${ctx}/AnalysisSupport/QualityRuleResult"
$.ajax({
type : 'GET',
contentType : 'application/json',
url: "${ctx}/AnalysisSupport/QualityRuleResult/ruleTableChange?dataSource="+dataSource+"&chnnal="+chnnal+"&bussines="+bussines+"&code"+code,
dataType : 'text',
async: false,
beforeSend: function(data) {
},
success: function(data) {
$("#qualityRuleView").val(data);
ruleResultDetailTable();
}
});
}
});
},
......
src/main/webapp/WEB-INF/views/AnalysisSupport/ReportOperationTable.jsp
View file @ 73a3469e
......@@ -30,8 +30,8 @@
<%--<td>${qualityRuleOperationDetail.kpiCode}</td>--%>
<td>${qualityRuleOperationDetail.warningType}</td>
<td>${qualityRuleOperationDetail.warningReason}</td>
<td><fmt:formatDate value="${qualityRuleOperationDetail.businessTime}" pattern="yyyy-MM-dd hh:mm:ss" /></td>
<td><fmt:formatDate value="${qualityRuleOperationDetail.kpiMonitorRunTime}" pattern="yyyy-MM-dd hh:mm:ss" /> </td>
<td><fmt:formatDate value="${qualityRuleOperationDetail.businessTime}" type="both" pattern="yyyy-MM-dd hh:mm:ss" /></td>
<td><fmt:formatDate value="${qualityRuleOperationDetail.kpiMonitorRunTime}" type="both" pattern="yyyy-MM-dd hh:mm:ss" /> </td>
</tr>
</c:forEach>
......
src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp
View file @ 73a3469e
......@@ -39,8 +39,8 @@
<td>${qualityRuleInfo.kpiCode}</td>
<td>${qualityRuleInfo.warningType}</td>
<td>${qualityRuleInfo.warningReason}</td>
<td>${qualityRuleInfo.businessTime}</td>
<td>${qualityRuleInfo.kpiMonitorRunTime}</td>
<td><fmt:formatDate value="${qualityRuleInfo.businessTime}" type="both" pattern="yyyy-MM-dd HH:mm:ss" /></td>
<td><fmt:formatDate value="${qualityRuleInfo.kpiMonitorRunTime}" type="both" pattern="yyyy-MM-dd HH:mm:ss" /></td>
<td><a href='javascript:;' onclick='selectRule(${qualityRuleInfo.qualityRuleId})'>查看规则</a></td>
<%--<td>--%>
<%--<c:if test="${qualityRuleInfo.ifFilter == '1'}">无过滤规则</c:if>--%>
......
src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp 0 → 100644
View file @ 73a3469e
This diff is collapsed.
src/main/webapp/WEB-INF/views/MonitorOperation/KeyLinkProcessAnalysis.jsp
View file @ 73a3469e
......@@ -183,6 +183,7 @@ AnalysisTypeReset();
<ul class="nav nav-tabs">
<li><a href="${ctx}/MonitorOperation/RegularityAnalysis">数据特征探查</a></li>
<li class="active"><a id="a_keyLink1" href="#keyLink1" >业务环节分析</a></li>
<li><a href="${ctx}/MonitorOperation/FlowMonitor">实体厅流量监测分析</a></li>
</ul>
</div>
<div class="section">
......
src/main/webapp/WEB-INF/views/MonitorOperation/RegularityAnalysis.jsp
View file @ 73a3469e
......@@ -52,13 +52,11 @@
<div id="content" class="container">
<div class="tab-bar-bt">
<ul class="nav nav-tabs">
<li class="active"><a id="a_home" href="#home"
data-toggle="tab">数据特征探查</a></li>
<li class="active"><a id="a_home" href="#home" data-toggle="tab">数据特征探查</a></li>
<%-- <li><a href="${ctx}/MonitorOperation/FailureForcast">故障预测</a>
</li> --%>
<li><a href="${ctx}/MonitorOperation/KeyLinkProcessAnalysis">业务环节分析</a>
</li>
<li><a href="${ctx}/MonitorOperation/KeyLinkProcessAnalysis">业务环节分析</a></li>
<li><a href="${ctx}/MonitorOperation/FlowMonitor">实体厅流量监测分析</a></li>
</ul>
</div>
<div class="section">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment