Skip to content

C
cmszMonitorAnalysis
Commit 243023f6 authored by 胡斌's avatar 胡斌
Browse files
Options

智能分析平台备份

parent aa514cb5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 292 additions and 145 deletions
.idea/workspace.xml
View file @ 243023f6
This diff is collapsed.
CmszMonitorAnalysis.war
View file @ 243023f6
No preview for this file type
src/main/java/com/hp/cmsz/entity/AssociateDiagosisWarningDetail.java 0 → 100644
View file @ 243023f6
package com.hp.cmsz.entity;
public class AssociateDiagosisWarningDetail {
private String ASSOCIATION_ID;
private String PROVINCE_ID;
private String ASSOCIATION_TYPE;
private String ASSOCIATION_DESC;
private String PROVINCE_NAME;
private String KPI_CODE;
private String KPI_ID;
private String KPI_NAME;
private String KPI_WEIGHT;
private String WARNING_NUM;
private String INFLUENCE_LEVEL;
public String getKPI_ID() {
return KPI_ID;
}
public void setKPI_ID(String KPI_ID) {
this.KPI_ID = KPI_ID;
}
public String getASSOCIATION_ID() {
return ASSOCIATION_ID;
}
public void setASSOCIATION_ID(String ASSOCIATION_ID) {
this.ASSOCIATION_ID = ASSOCIATION_ID;
}
public String getPROVINCE_ID() {
return PROVINCE_ID;
}
public void setPROVINCE_ID(String PROVINCE_ID) {
this.PROVINCE_ID = PROVINCE_ID;
}
public String getASSOCIATION_TYPE() {
return ASSOCIATION_TYPE;
}
public void setASSOCIATION_TYPE(String ASSOCIATION_TYPE) {
this.ASSOCIATION_TYPE = ASSOCIATION_TYPE;
}
public String getASSOCIATION_DESC() {
return ASSOCIATION_DESC;
}
public void setASSOCIATION_DESC(String ASSOCIATION_DESC) {
this.ASSOCIATION_DESC = ASSOCIATION_DESC;
}
public String getPROVINCE_NAME() {
return PROVINCE_NAME;
}
public void setPROVINCE_NAME(String PROVINCE_NAME) {
this.PROVINCE_NAME = PROVINCE_NAME;
}
public String getKPI_CODE() {
return KPI_CODE;
}
public void setKPI_CODE(String KPI_CODE) {
this.KPI_CODE = KPI_CODE;
}
public String getKPI_NAME() {
return KPI_NAME;
}
public void setKPI_NAME(String KPI_NAME) {
this.KPI_NAME = KPI_NAME;
}
public String getKPI_WEIGHT() {
return KPI_WEIGHT;
}
public void setKPI_WEIGHT(String KPI_WEIGHT) {
this.KPI_WEIGHT = KPI_WEIGHT;
}
public String getWARNING_NUM() {
return WARNING_NUM;
}
public void setWARNING_NUM(String WARNING_NUM) {
this.WARNING_NUM = WARNING_NUM;
}
public String getINFLUENCE_LEVEL() {
return INFLUENCE_LEVEL;
}
public void setINFLUENCE_LEVEL(String INFLUENCE_LEVEL) {
this.INFLUENCE_LEVEL = INFLUENCE_LEVEL;
}
}
src/main/java/com/hp/cmsz/entity/XcdWarningInfoView.java
View file @ 243023f6
......@@ -56,6 +56,7 @@ public class XcdWarningInfoView {
private String workingOrderCode;
private String riskPictureFileName; //隐患图片
private String influenceEndTime; //隐患图片
private Long ifFilter; //隐患图片
private Long dataModelTypeId;
private String dataModelName;
......@@ -286,4 +287,12 @@ public class XcdWarningInfoView {
public void setInfluenceEndTime(String influenceEndTime) {
this.influenceEndTime = influenceEndTime;
}
public Long getIfFilter() {
return ifFilter;
}
public void setIfFilter(Long ifFilter) {
this.ifFilter = ifFilter;
}
}
src/main/java/com/hp/cmsz/entity/commonmanage/EWarningCalcResult.java
View file @ 243023f6
......@@ -11,9 +11,9 @@ public class EWarningCalcResult {
private Long ewarningDataresultId;
private Timestamp resultDate;
private Long dim1Val;
private Double dim1Val;
private Long dim2Val;
private Double dim2Val;
private Long ewarningDetailId;
@Id
......@@ -35,19 +35,19 @@ public class EWarningCalcResult {
this.resultDate = resultDate;
}
@Column(name = "dim1_val")
public Long getDim1Val() {
public Double getDim1Val() {
return dim1Val;
}
public void setDim1Val(Long dim1Val) {
public void setDim1Val(Double dim1Val) {
this.dim1Val = dim1Val;
}
@Column(name = "dim2_val")
public Long getDim2Val() {
public Double getDim2Val() {
return dim2Val;
}
public void setDim2Val(Long dim2Val) {
public void setDim2Val(Double dim2Val) {
this.dim2Val = dim2Val;
}
......
src/main/java/com/hp/cmsz/repository/DimAssociationAnaInfoDao.java
View file @ 243023f6
......@@ -85,22 +85,28 @@ public interface DimAssociationAnaInfoDao extends JpaSpecificationExecutor<DimAs
@Query(value = "SELECT ASSOCIATION_ID, D.PROVINCE_ID, ASSOCIATION_TYPE ,ASSOCIATION_DESC, PROVINCE_NAME, WARNING_BEGIN_TIME, WARNING_END_TIME," +
" COUNT(E.KPI_ID) AS WARNING_NUM FROM (" +
" SELECT A.ASSOCIATION_ID,A.PROVINCE_ID, A.ASSOCIATION_DESC, A.ASSOCIATION_TYPE, B.KPI_ID, C.PROVINCE_NAME, TO_TIMESTAMP(?1,'YYYY-MM-DD HH24:MI:SS') AS WARNING_BEGIN_TIME," +
" TO_TIMESTAMP(?2,'YYYY-MM-DD HH24:MI:SS') AS WARNING_END_TIME" +
" FROM CCOLAP.DIM_ASSOCIATION_ANALYSIS_INFO_T A INNER JOIN DIM_KPI_ASSOCIATION_RELATED_INFO_T B"+
" ON A.ASSOCIATION_ID=B.ASSOCIATION_ID INNER JOIN DIM_PROVINCE_INFO_T C ON C.PROVINCE_ID= A.PROVINCE_ID) D"+
" LEFT JOIN GJFX_WARNING_INFO_T E" +
" ON D.PROVINCE_ID = E.PROVINCE_ID AND D.KPI_ID =E.KPI_ID AND WARNING_ID LIKE 'J%'" +
" and OCCUR_TIME >= TO_TIMESTAMP(?1,'YYYY-MM-DD HH24:MI:SS')" +
" AND OCCUR_TIME <=TO_TIMESTAMP(?2,'YYYY-MM-DD HH24:MI:SS') WHERE ASSOCIATION_TYPE = ?3 and D.PROVINCE_ID in (?4) GROUP BY ASSOCIATION_ID,D.PROVINCE_ID, ASSOCIATION_TYPE ,ASSOCIATION_DESC,PROVINCE_NAME, WARNING_BEGIN_TIME, WARNING_END_TIME"
,nativeQuery = true)
public Object[] findAssociateDiagosisDetailByAssociationId(Long associationId);
// @Query(value = "SELECT ASSOCIATION_ID, D.PROVINCE_ID, ASSOCIATION_TYPE ,ASSOCIATION_DESC, PROVINCE_NAME, WARNING_BEGIN_TIME, WARNING_END_TIME," +
// " COUNT(E.KPI_ID) AS WARNING_NUM FROM (" +
// " SELECT A.ASSOCIATION_ID,A.PROVINCE_ID, A.ASSOCIATION_DESC, A.ASSOCIATION_TYPE, B.KPI_ID, C.PROVINCE_NAME, TO_TIMESTAMP(?1,'YYYY-MM-DD HH24:MI:SS') AS WARNING_BEGIN_TIME," +
// " TO_TIMESTAMP(?2,'YYYY-MM-DD HH24:MI:SS') AS WARNING_END_TIME" +
// " FROM CCOLAP.DIM_ASSOCIATION_ANALYSIS_INFO_T A INNER JOIN DIM_KPI_ASSOCIATION_RELATED_INFO_T B"+
// " ON A.ASSOCIATION_ID=B.ASSOCIATION_ID INNER JOIN DIM_PROVINCE_INFO_T C ON C.PROVINCE_ID= A.PROVINCE_ID) D"+
// " LEFT JOIN GJFX_WARNING_INFO_T E" +
// " ON D.PROVINCE_ID = E.PROVINCE_ID AND D.KPI_ID =E.KPI_ID AND WARNING_ID LIKE 'J%'" +
// " and OCCUR_TIME >= TO_TIMESTAMP(?1,'YYYY-MM-DD HH24:MI:SS')" +
// " AND OCCUR_TIME <=TO_TIMESTAMP(?2,'YYYY-MM-DD HH24:MI:SS') WHERE ASSOCIATION_TYPE = ?3 and D.PROVINCE_ID in (?4) GROUP BY ASSOCIATION_ID,D.PROVINCE_ID, ASSOCIATION_TYPE ,ASSOCIATION_DESC,PROVINCE_NAME, WARNING_BEGIN_TIME, WARNING_END_TIME"
// ,nativeQuery = true)
// public Object[] findAssociateDiagosisDetailByAssociationId(Long associationId);
@Query(value = "SELECT ASSOCIATION_ID, PROVINCE_ID, ASSOCIATION_TYPE , ASSOCIATION_DESC, PROVINCE_NAME, WARNING_BEGIN_TIME, WARNING_END_TIME, KPI_CODE, KPI_NAME, KPI_ID, KPI_WEIGHT, WARNING_NUM, CASE WHEN INFLUENCE_LEVEL>0.8 THEN '高' WHEN INFLUENCE_LEVEL>0.5 AND INFLUENCE_LEVEL<0.5 THEN '中' ELSE '低' END AS INFLUENCE_LEVEL FROM ( SELECT ASSOCIATION_ID, D.PROVINCE_ID, ASSOCIATION_TYPE, ASSOCIATION_DESC, PROVINCE_NAME, WARNING_BEGIN_TIME, WARNING_END_TIME, D.KPI_CODE,D.KPI_NAME, D.KPI_ID, KPI_WEIGHT,COUNT(E.KPI_ID)AS WARNING_NUM, KPI_WEIGHT* COUNT(E.KPI_ID) AS INFLUENCE_LEVEL FROM ( SELECT A.ASSOCIATION_ID,A.PROVINCE_ID,A.ASSOCIATION_DESC,A.ASSOCIATION_TYPE, B.KPI_ID, D.KPI_CODE, D.KPI_NAME, B.KPI_WEIGHT, C.PROVINCE_NAME, TO_TIMESTAMP(?1,'YYYY-MM-DD HH24:MI:SS') AS WARNING_BEGIN_TIME, TO_TIMESTAMP(?2,'YYYY-MM-DD HH24:MI:SS') AS WARNING_END_TIME FROM CCOLAP.DIM_ASSOCIATION_ANALYSIS_INFO_T A INNER JOIN CCOLAP.DIM_KPI_ASSOCIATION_RELATED_INFO_T B ON A.ASSOCIATION_ID=B.ASSOCIATION_ID INNER JOIN CCOLAP.DIM_PROVINCE_INFO_T C ON C.PROVINCE_ID= A.PROVINCE_ID INNER JOIN CCOLAP.DIM_KPI_INFO_T D ON B.KPI_ID=D.KPI_ID) D LEFT JOIN CCOLAP.GJFX_WARNING_INFO_T E ON D.PROVINCE_ID=E.PROVINCE_ID AND D.KPI_ID =E.KPI_ID AND WARNING_ID LIKE 'J%' WHERE OCCUR_TIME >=TO_TIMESTAMP(?1,'YYYY-MM-DD HH24:MI:SS') AND OCCUR_TIME <=TO_TIMESTAMP(?2,'YYYY-MM-DD HH24:MI:SS') AND ASSOCIATION_ID= ?3 GROUP BY ASSOCIATION_ID, D.PROVINCE_ID, ASSOCIATION_TYPE , ASSOCIATION_DESC, PROVINCE_NAME, WARNING_BEGIN_TIME, WARNING_END_TIME, D.KPI_CODE, D.KPI_NAME,D.KPI_ID,KPI_WEIGHT)G"
,nativeQuery = true)
public Object[] findDetailByAssociationIdAndWarnBeginToEndTime(String beginTime,String endTime,Long associationId);
public List<Object[]> findDetailByAssociationIdAndWarnBeginToEndTime(String beginTime,String endTime,Long associationId);
}
src/main/java/com/hp/cmsz/repository/XcdWarningInfoViewDao.java
View file @ 243023f6
......@@ -25,8 +25,13 @@ import com.hp.cmsz.entity.XcdWarningInfoView;
public interface XcdWarningInfoViewDao extends PagingAndSortingRepository<XcdWarningInfoView,Long>,JpaSpecificationExecutor<XcdWarningInfoView> {
//根绝筛选条件从视图中去查找符合条件的预警或隐患
List <XcdWarningInfoView> findByOccurTimeBetweenAndWarningSourceIdInAndRiskEarlyWarningTypeIdInAndDataSourceIdInAndChannelIdInAndBusinessIdInAndProviderIdInAndImportanceLevelIdInAndProvinceIdInAndCloseStatusInAndTypeInOrderByWarningSourceIdAscOccurTimeDescDataSourceIdAscChannelIdAscProvinceIdAscKpiIdAsc(Date time1,Date time2,List<Long> warningsource,List<Long>risk,List<Long> dataSource,List<Long> chnnal,List<Long>busines,List<Long>provider,List<Long>level,List<Long>province,String[] status,String[] relStatus);
//根据协查单编码获取对应的预警或隐患的记录
List <XcdWarningInfoView> findByOccurTimeBetweenAndWarningSourceIdInAndRiskEarlyWarningTypeIdInAndDataSourceIdInAndChannelIdInAndBusinessIdInAndProviderIdInAndImportanceLevelIdInAndProvinceIdInAndCloseStatusInAndTypeInAndIfFilterInOrderByWarningSourceIdAscOccurTimeDescDataSourceIdAscChannelIdAscProvinceIdAscKpiIdAsc(Date time1,Date time2,List<Long> warningsource,List<Long>risk,List<Long> dataSource,List<Long> chnnal,List<Long>busines,List<Long>provider,List<Long>level,List<Long>province,String[] status,String[] relStatus,List<Long> filter);
//根绝筛选条件从视图中去查找符合条件的预警或隐患
List <XcdWarningInfoView> findByOccurTimeBetweenAndWarningSourceIdInAndRiskEarlyWarningTypeIdInAndDataSourceIdInAndChannelIdInAndBusinessIdInAndProviderIdInAndImportanceLevelIdInAndProvinceIdInAndCloseStatusInAndTypeInOrderByWarningSourceIdAscOccurTimeDescDataSourceIdAscChannelIdAscProvinceIdAscKpiIdAsc(Date time1,Date time2,List<Long> warningsource,List<Long>risk,List<Long> dataSource,List<Long> chnnal,List<Long>busines,List<Long>provider,List<Long>level,List<Long>province,String[] status,String[] relStatus);
//根据协查单编码获取对应的预警或隐患的记录
List <XcdWarningInfoView>findByWorkingOrderCodeOrderByWarningSourceIdAscOccurTimeDescDataSourceIdAscChannelIdAscProvinceIdAscKpiIdAsc(String workingOrderCode);
//根据告警ID获取对应的预警或隐患的记录
List <XcdWarningInfoView> findByWarningId(String warningId);
......
src/main/java/com/hp/cmsz/service/monitoroperation/AssociateDiagosisDetailService.java
View file @ 243023f6
......@@ -60,7 +60,13 @@ public class AssociateDiagosisDetailService {
return dimAssociationAnaInfoDao.findLastMathAssociateDiagosisDetailByWarnTimeBeginAndEndAndDimesionAndProvinceList(warnBeginTime, warnEndTime,dimension,provincelist);
}
public Object[] findDetailByAssociationIdAndWarnBeginToEndTime(String beginTime,String endTime,Long associationId){
// public Object[] findDetailByAssociationIdAndWarnBeginToEndTime(String beginTime,String endTime,Long associationId){
// return dimAssociationAnaInfoDao.findDetailByAssociationIdAndWarnBeginToEndTime(beginTime,endTime,associationId);
// }
public List<Object[]> findByWarningListDetail(String beginTime,String endTime,Long associationId){
System.out.println(beginTime+","+endTime+","+associationId);
return dimAssociationAnaInfoDao.findDetailByAssociationIdAndWarnBeginToEndTime(beginTime,endTime,associationId);
}
......
src/main/java/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.java
View file @ 243023f6
......@@ -135,12 +135,19 @@ public class XcdWorkingOrderInfoService {
}
*/
//根据筛选条件获取对应的预警或隐患
public List<XcdWarningInfoView> getXcdWarningInfoViewBy(Date time1,Date time2, List<Long> warningsource,List<Long>risk,List<Long> dataSource,List<Long> chnnal,List<Long>busines,List<Long>provider,List<Long>level,List<Long>province,String[] status,String[] relStatus){
return xcdWarningInfoViewDao.findByOccurTimeBetweenAndWarningSourceIdInAndRiskEarlyWarningTypeIdInAndDataSourceIdInAndChannelIdInAndBusinessIdInAndProviderIdInAndImportanceLevelIdInAndProvinceIdInAndCloseStatusInAndTypeInOrderByWarningSourceIdAscOccurTimeDescDataSourceIdAscChannelIdAscProvinceIdAscKpiIdAsc(time1,time2,warningsource,risk,dataSource,chnnal,busines,provider,level,province,status,relStatus);
//根据筛选条件获取对应的预警或隐患筛选时候加上是否过滤
public List<XcdWarningInfoView> getXcdWarningInfoViewIfFilterBy(Date time1,Date time2, List<Long> warningsource,List<Long>risk,List<Long> dataSource,List<Long> chnnal,List<Long>busines,List<Long>provider,List<Long>level,List<Long>province,String[] status,String[] relStatus,List<Long> warningFilter){
return xcdWarningInfoViewDao.findByOccurTimeBetweenAndWarningSourceIdInAndRiskEarlyWarningTypeIdInAndDataSourceIdInAndChannelIdInAndBusinessIdInAndProviderIdInAndImportanceLevelIdInAndProvinceIdInAndCloseStatusInAndTypeInAndIfFilterInOrderByWarningSourceIdAscOccurTimeDescDataSourceIdAscChannelIdAscProvinceIdAscKpiIdAsc(time1,time2,warningsource,risk,dataSource,chnnal,busines,provider,level,province,status,relStatus,warningFilter);
}
//根据筛选条件获取对应的预警或隐患
public List<XcdWarningInfoView> getXcdWarningInfoViewBy(Date time1,Date time2, List<Long> warningsource,List<Long>risk,List<Long> dataSource,List<Long> chnnal,List<Long>busines,List<Long>provider,List<Long>level,List<Long>province,String[] status,String[] relStatus){
return xcdWarningInfoViewDao.findByOccurTimeBetweenAndWarningSourceIdInAndRiskEarlyWarningTypeIdInAndDataSourceIdInAndChannelIdInAndBusinessIdInAndProviderIdInAndImportanceLevelIdInAndProvinceIdInAndCloseStatusInAndTypeInOrderByWarningSourceIdAscOccurTimeDescDataSourceIdAscChannelIdAscProvinceIdAscKpiIdAsc(time1,time2,warningsource,risk,dataSource,chnnal,busines,provider,level,province,status,relStatus);
}
//根据协查单id查找对应的预警或隐患的记录
public List<XcdWarningInfoView> getXcdWarningInfoViewByWorkingOrderCode(String WorkingOrderId){
return xcdWarningInfoViewDao.findByWorkingOrderCodeOrderByWarningSourceIdAscOccurTimeDescDataSourceIdAscChannelIdAscProvinceIdAscKpiIdAsc(WorkingOrderId);
......
src/main/java/com/hp/cmsz/web/monitoroperation/AssociateDiagosisDetailController.java
View file @ 243023f6
......@@ -30,6 +30,8 @@ import java.text.SimpleDateFormat;
import java.util.*;
import com.hp.cmsz.service.monitoroperation.AssociateDiagosisDetailService;
import sun.rmi.transport.ObjectTable;
/**
* AssociateDiagosisDetailControllerr 监控运营>告警关联诊>关联诊断明细
*
......@@ -167,12 +169,12 @@ public class AssociateDiagosisDetailController {
@RequestMapping(value ={"/details"})
public String details(
@RequestParam(value = "associationId",defaultValue = "") String associationId,
@RequestParam(value = "beginTime",defaultValue = "") String beginTime,
@RequestParam(value = "endTime",defaultValue = "") String endTime,
@RequestParam(value = "provinceName",defaultValue = "") String provinceName,
@RequestParam(value = "associationType",defaultValue = "") String associationType,
@RequestParam(value = "associationDesc",defaultValue = "") String associationDesc,
@RequestParam(value = "warningNum",defaultValue = "") String warningNum,
@RequestParam(value = "beginTime",defaultValue = "") String beginTime,
@RequestParam(value = "endTime",defaultValue = "") String endTime,
Map map){
......@@ -183,16 +185,35 @@ public class AssociateDiagosisDetailController {
map.put("associationType",associationType);
map.put("associationDesc",associationDesc);
map.put("warningNum",warningNum);
List<Object []> WarningDetailList= null;
if("".equalsIgnoreCase(associationId)||"".equalsIgnoreCase(beginTime)||"".equalsIgnoreCase(endTime)){
}else{
Long associationIdL=Long.parseLong(associationId);
WarningDetailList = associateDiagosisDetailService.findByWarningListDetail(beginTime,endTime,associationIdL);
}
List<AssociateDiagosisWarningDetail> adwdl = new ArrayList<AssociateDiagosisWarningDetail>();
for (Object[] objects : WarningDetailList) {
AssociateDiagosisWarningDetail adwd = new AssociateDiagosisWarningDetail();
adwd.setASSOCIATION_ID(String.valueOf(objects[0]) );
adwd.setASSOCIATION_TYPE(objects[2]+"");
adwd.setASSOCIATION_DESC(objects[3]+"");
adwd.setPROVINCE_NAME( objects[4]+"");
adwd.setPROVINCE_ID( objects[1]+"");
adwd.setKPI_CODE(objects[7]+"");
adwd.setKPI_NAME(objects[8]+"");
adwd.setKPI_ID(String.valueOf(objects[9]));
adwd.setKPI_WEIGHT(String.valueOf(objects[10]));
adwd.setWARNING_NUM(String.valueOf( objects[11]));
adwd.setINFLUENCE_LEVEL(String.valueOf( objects[12]));
adwdl.add(adwd);
}
System.out.println(adwdl.size());
map.put("warningDetailList",adwdl);
return PageURLController.AssociateDetails;
}
......
src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java
View file @ 243023f6
......@@ -179,6 +179,7 @@ public class WorkingOrderManageControll {
@RequestParam(value = "status") String status,//告警关闭状态
@RequestParam(value = "relStatus") String relStatus,//告警状态
@RequestParam(value = "code") String code,//协查单编号
@RequestParam(value = "warningFilter") String warningFilter,//是否过滤
@RequestParam(value = "earlyWarningId") String earlyWarningId,//告警ID
HttpServletResponse response) throws ParseException, UnsupportedEncodingException {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
......@@ -202,6 +203,7 @@ public class WorkingOrderManageControll {
String[] provinceS=province.split(",");
String[] statusS=status.split(",");
String[] relStatusS=relStatus.split(",");
String[] warningFilterS=warningFilter.split(",");
Date time1=sdf.parse(time[0]);
Date time2=sdf.parse(time[1]);
List<Long> warningSourceList=changeStrToList(warningSourceS);
......@@ -212,7 +214,9 @@ public class WorkingOrderManageControll {
List<Long> providerList=changeStrToList(providerS);
List<Long> levelList=changeStrToList(levelS);
List<Long> provinceList=changeStrToList(provinceS);
xcdWarningInfoS =xcdWorkingOrderInfoService.getXcdWarningInfoViewBy(time1,time2,warningSourceList,riskList,dataSourceList,chnnalList,bussinesList,providerList,levelList,provinceList,statusS,relStatusS);
List<Long> filterList=changeStrToList(warningFilterS);
xcdWarningInfoS =xcdWorkingOrderInfoService.getXcdWarningInfoViewIfFilterBy(time1,time2,warningSourceList,riskList,dataSourceList,chnnalList,bussinesList,providerList,levelList,provinceList,statusS,relStatusS,filterList);
}else{
if(!code.equals("0")){
......
src/main/webapp/WEB-INF/tags/WarningFilter.tag
View file @ 243023f6
......@@ -6,9 +6,10 @@
<div id="ws3" class="slide-menu-option">
<label>告警是否过滤</label> <!-- <div class="slide-select"> -->
<select class="slide-menu-select" id="relStatus" name="relStatus">
<option value="是" title="是" ><a href="#">是</a></option>
<option value="否" title="否" selected><a href="#">否</a></option>
<select class="slide-menu-select" id="warningFilter" name="warningFilter">
<option value="0,1" title="全部" selected><a href="#">全部</a></option>
<option value="1" title="是" ><a href="#">是</a></option>
<option value="0" title="否" ><a href="#">否</a></option>
</select>
<!-- </div> -->
</div>
......@@ -17,14 +18,14 @@
<script type="text/javascript">
// function getStatus(){
// return $("#relStatus").val();
// }
// function getStatusName(){
//
// return $("#relStatus").find("option:selected").attr("title");
// }
// function StatusReset(){
// $("#relStatus").val("0,1,2,3");
// }
function getWarningFilter(){
return $("#warningFilter").val();
}
function getStatusName(){
return $("#relStatus").find("option:selected").attr("title");
}
function StatusReset(){
$("#relStatus").val("0");
}
</script>
\ No newline at end of file
src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleOperation.jsp
View file @ 243023f6
......@@ -45,7 +45,7 @@
<div class="container">
<ol class="breadcrumb">
<li><a href="${ctx}/index">首页</a></li>
<li>运营支撑</li>
<li>数据质量核查</li>
<li class="active">质量规则运营</li>
</ol>
</div>
......
src/main/webapp/WEB-INF/views/MonitorOperation/AssociateDetails.jsp
View file @ 243023f6
......@@ -56,39 +56,24 @@
<div class="col-xs-12">
<table class='table table-vertical'>
<tr>
<td><label>开始时间：</label>aa${detail.warnBeginTime}</td>
<td><label>结束时间：</label>aa${detail.warnEndTime}</td>
<td><label>开始时间：</label>${beginTime}</td>
<td><label>结束时间：</label>${endTime}</td>
</tr>
<tr>
<td><label>省份：</label>aa${detail.provinceName}</td>
<td><label>类型：</label>aa${detail.associationType}</td>
<c:choose >
<c:when test="${detail.associationType == 'c'}">
业务
</c:when>
<c:when test="${detail.associationType == 'y'}">
渠道
</c:when>
<c:otherwise>
未知
</c:otherwise>
</c:choose>
<td><label>省份：</label>${provinceName}</td>
<td><label>类型：</label>${associationType}</td>
</tr>
<tr>
<td><label>名称：</label>aa${detail.associationDesc}</td>
<td><label>告警个数：</label>aa${detail.warningNum}</td>
</tr>
<tr>
<td><label>异常程度：</label>aa${detail.warnBeginTime}</td>
<td><label>指标告警明细：</label>"aa${detail.warnBeginTime}</td>
<td><label>名称：</label>${associationDesc}</td>
<td><label>告警个数：</label>${warningNum}</td>
</tr>
</table>
<br>
<table class='table table-vertical'>
<tr>
<th>开始时间</th>
<th>结束时间</th>
<th>省份</th>
<th>指标名称</th>
<th>指标编码</th>
<th>类型</th>
<th>名称</th>
<th>告警个数</th>
......@@ -96,16 +81,23 @@
<th>指标告警明细</th>
</tr>
<c:forEach items="detailList" var="item">
<c:forEach items="${warningDetailList}" var="item">
<tr>
<td>${item.}</td>
<td>${item.}</td>
<td>${item.}</td>
<td>${item.}</td>
<td>${item.}</td>
<td>${item.}</td>
<td>${item.}</td>
<td>${item.}</td>
<td>${item.PROVINCE_NAME}</td>
<td>${item.KPI_NAME}</td>
<td>${item.KPI_CODE}</td>
<td>
<c:if test="${item.ASSOCIATION_TYPE == 'c'}">
业务
</c:if>
<c:if test="${item.ASSOCIATION_TYPE == 'y'}">
渠道
</c:if>
</td>
<td>${item.ASSOCIATION_DESC}</td>
<td>${item.WARNING_NUM}</td>
<td>${item.INFLUENCE_LEVEL}</td>
<td><a href="#">告警明细</a></td>
</tr>
</c:forEach>
</table>
......
src/main/webapp/WEB-INF/views/MonitorOperation/AssociateDiagosisDetail.jsp
View file @ 243023f6
......@@ -23,7 +23,7 @@
<script src="${ctx}/static/artDialog4.1.7/artDialog.source.js?skin=default"></script>
<script src="${ctx}/static/artDialog4.1.7/plugins/iframeTools.source.js"></script>
<script type="text/javascript" src="${ctx}/static/js/associatediagosisdetail.js"></script>
<script type="text/javascript">
$(document).ready(function(){
......@@ -37,8 +37,35 @@
var v=document.getElementById('gzfxDetail').value;
console.log("v "+v);
});
</script>
function goClick(e,id){
var beginTime="";
var endTime="";
var provinceName="";
var associationType="";
var associationDesc="";
var warningNum="";
$(e).parent().prevAll().each(function(ind,dom){
if(ind == 2){warningNum=$(dom).text()}
if(ind == 3){associationDesc=$(dom).text()}
if(ind == 4){associationType=$(dom).text()}
if(ind == 5){provinceName=$(dom).text()}
if(ind == 0){endTime=$(dom).text()}
if(ind == 1){beginTime=$(dom).text()}
});
window.location.href = "${ctx}/MonitorOperation/AssociateDiagosisDetail/details?"+
"associationId="+id+
"&provinceName="+provinceName+
"&associationType="+associationType+
"&associationDesc="+associationDesc+
"&warningNum="+warningNum+
"&beginTime="+beginTime+
"&endTime="+endTime;
}
</script>
<script type="text/javascript" src="${ctx}/static/js/associatediagosisdetail.js"></script>
</head>
<body>
......@@ -90,7 +117,7 @@
<span class="glyphicon glyphicon-list"></span>
</button>
<div class="slide-menu-tags">
<span id="detailPeriodTag" class="label label-info" data-placement="bottom">最近一个月</span>
<%--<span id="detailPeriodTag" class="label label-info" data-placement="bottom">最近一个月</span>--%>
<span id="detailTimeTag" class="label label-info"
data-placement="bottom"></span>
......@@ -220,7 +247,8 @@
$("#detailXcdStatusTag").empty();
$("#detailWarningSourceTag").empty();
$('#detailTitleTag').text("故障标题："+$("#titleText").val());
}else{
}
else{
$('#detailTitleTag').empty();
$("#detailWarningSourceTag").text("故障来源").append($("<span class='badge'></span>").text(getStatsWarningSourceCheckedValues().length)).attr('data-original-title',getStatsWaringSourceCheckedTitles()).tooltip();
$("#detailXcdStatusTag").text("协查单状态："+getXcdStatusTitle());
......@@ -239,10 +267,6 @@
}
}
//获取选取的时间段,返回结果为字符串数组
function getPeriod(){
var period=new Array();
......@@ -339,28 +363,7 @@
listForm.attr("action","#");
});
function goClick(e){
console.log("=-- e.tit name"+e.name);
//alert($(e).attr("title")+"---");
var beginTime="";
var endTime="";
var provinceName="";
var associationType="";
var associationDesc="";
var warningNum="";
$(e).parent().prevAll().each(function(ind,dom){
if(ind == 0){warningNum=$(dom).text()}
if(ind == 1){associationDesc=$(dom).text()}
if(ind == 2){associationType=$(dom).text()}
if(ind == 3){provinceName=$(dom).text()}
if(ind == 4){endTime=$(dom).text()}
if(ind == 5){beginTime=$(dom).text()}
});
window.location.href = "${ctx}/MonitorOperation/AssociateDiagosisDetail/details?associationId="+e.name+"&warningNum="+warningNum
+"&associationDesc="+associationDesc+"&associationType="+associationType+"&provinceName="+provinceName+"&endTime="endTime+"&beginTime="+beginTime;
}
</script>
......
src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp
View file @ 243023f6
......@@ -764,6 +764,7 @@ th{
var province=getProvinceCheckedValuesString();
var status=getCloseStaus();
var relStatus=getRelStatus();
var warningFilter = getWarningFilter();
var code=$.trim(document.getElementById("workingOrderID").value);
var earlyWarnId = $.trim(document.getElementById("earlyWarningID").value);
if(code==="" && earlyWarnId===""){
......@@ -819,6 +820,7 @@ th{
+"&status="+status
+"&relStatus="+relStatus
+"&code="+"0"
+"&warningFilter="+warningFilter
+"&earlyWarningId="+"0";
upLoadExcel="${ctx}/MonitorOperation/WorkingOrderManage/uploadexcel?warningSource="+warningSource
+"&period="+period
......@@ -862,6 +864,7 @@ th{
+"&status="+status
+"&relStatus="+relStatus
+"&code="+code
+"&warningFilter="+warningFilter
+"&earlyWarningId="+"0";
upLoadExcel="${ctx}/MonitorOperation/WorkingOrderManage/uploadexcel?warningSource="+warningSource
+"&period="+period
......@@ -875,6 +878,7 @@ th{
+"&province="+province
+"&status="+status
+"&relStatus="+relStatus
+"&warningFilter="+warningFilter
+"&code="+code
+"&earlyWarningId="+"0";
}else{
......@@ -893,7 +897,8 @@ th{
+"&status="+status
+"&relStatus="+relStatus
+"&code="+"0"
+"&earlyWarningId="+earlyWarnId;
+"&warningFilter="+warningFilter
+"&earlyWarningId="+earlyWarnId;
upLoadExcel="${ctx}/MonitorOperation/WorkingOrderManage/uploadexcel?warningSource="+warningSource
+"&period="+period
+"&warningSource="+warningSource
......@@ -906,7 +911,8 @@ th{
+"&province="+province
+"&status="+status
+"&relStatus="+relStatus
+"&code="+"0"
+"&code="+"0"
+"&warningFilter="+warningFilter
+"&earlyWarningId="+earlyWarnId;
}
......
src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp
View file @ 243023f6
......@@ -152,14 +152,6 @@ taskName = "自定义任务";
});
}
function choseTask(){
......
src/main/webapp/static/js/associatediagosisdetail.js
View file @ 243023f6
function initTable(){
jsonStr = document.getElementById('gzfxDetail').value;
alert("jsonStr" +jsonStr);
// alert("jsonStr" +jsonStr);
var header = new Array();
header[0] = ["<input type='checkbox' name='ckAll' id='ckAll' class='ckAll' onclick='javascript:checkAll();'/>","checkbox","1%",""];
header[1] = ["开始时间","warnBeginTime","10%",""];
header[2] = ["结束时间","warnEndTime","10%","16"];
header[3] = ["省份","provinceName","5%",""];
header[4] = ["类型","associationType","8%",""];
header[5] = ["名称","associationDesc","8%",""];
header[6] = ["告警个数","warningNum","8%",""];
header[0] = ["","1","1%",""];
header[1] = ["省份","provinceName","5%",""];
header[2] = ["类型","associationType","8%",""];
header[3] = ["名称","associationDesc","8%",""];
header[4] = ["告警个数","warningNum","8%",""];
header[5] = ["开始时间","warnBeginTime","10%",""];
header[6] = ["结束时间","warnEndTime","10%",""];
header[7] = ["指标告警明细","associationId","8%",""];
window.pagging = new table_pagging({limit:11,tableId:'failureAnalysisDetailTable',header:header});
pagging.pagging(jsonStr);
}
......@@ -86,8 +87,7 @@ table_pagging.prototype={
},
cloumnModel:function(){
}
,
},
pagging:function(objectJson){
this.objectlist = eval('('+objectJson+')');
if(this.start+this.limit >=this.objectlist.length){
......@@ -179,15 +179,10 @@ table_pagging.prototype={
if(tdContext==null){
tdContext = "&nbsp;";
}
if(k==1|| k==2){
if(k==5|| k==6){
tdContext=this.getData(this.objectlist[i],this.header[k][1]);
var d=new Date(tdContext);
tdContext=(d.getFullYear()+1)+"-"+d.getMonth()+"-"+d.getDate()+" "+d.getHours()+":"+d.getMinutes()+":"+d.getSeconds();
console.log("---"+(d.getFullYear()+1)+"-"+d.getMonth()+"-"+d.getDate()+" "+d.getHours()+":"+d.getMinutes()+":"+d.getSeconds());
console.log(tdContext+"--");
console.log("type "+ typeof tdContext);
}else if(k == 4){
tdContext=df.format(new Date(tdContext))
}else if(k == 2){
tdContext=this.getData(this.objectlist[i],this.header[k][1]);
if(tdContext == 'c'){
tdContext="业务";
......@@ -197,9 +192,11 @@ table_pagging.prototype={
}
}
else if(k == 7){
//tdContext="<a name='"+this.getData(this.objectlist[i],this.header[0][1])+"' title='"+this.getData(this.objectlist[i],this.header[0][1])+"' onclick='goClick(this)'>详情</a>";
console.log(this.getData(this.objectlist[i],this.header[k][1])+" + == ");
tdContext="<a name='"+this.getData(this.objectlist[i],this.header[7][1])+"' onclick='goClick(this)'>详-情</a>";
var id=this.getData(this.objectlist[i],this.header[7][1]);
var st=this.getData(this.objectlist[i],this.header[5][1]);
var et=this.getData(this.objectlist[i],this.header[6][1]);
// tdContext="<a onclick='goClick("+id+","+new Date(st).getTime()+","+new Date(et).getTime()+")'>详-情</a>";
tdContext="<a onclick='goClick(this"+","+id+")'>详-情</a>";
}else{
tdContext = this.getData(this.objectlist[i],this.header[k][1]);
}
......@@ -207,13 +204,6 @@ table_pagging.prototype={
}
} else {
/*tdContext="<input type='checkbox' name='failureBox"+i+"' class='failureBox' onclick='javascript:checkFailureIdsChoose(this);'/>"+"<span style='display:none'>"+i+"</span>";
for ( var t = 0; t < checkFailureIds.length; t++) {
if (checkFailureIds[t] == this.getData(this.objectlist[i], "failureId")){
tdContext="<input type='checkbox' name='failureBox"+i+"' class='failureBox' checked onclick='javascript:checkFailureIdsChoose(this);'/>"+"<span style='display:none'>"+i+"</span>";
break;
}
}*/
}
} else {
tdContext = "&nbsp;";
......
src/main/webapp/static/js/ruleReportDetailTable.js
View file @ 243023f6
......@@ -544,7 +544,7 @@ function selectOperation(provinceId,kpiId,reportSumStartTime,reportSumEndTime){
$.ajax({
type : 'GET',
contentType : 'application/json',
url: "/AnalysisSupport/QualityRuleReport/findOperation?provinceId="+provinceId+"&kpiId="+kpiId+"&reportSumStartTime="+df.format(new Date(reportSumStartTime))+"&reportSumEndTime="+df.format(new Date(reportSumStartTime)),
url: "/AnalysisSupport/QualityRuleReport/findOperation?provinceId="+provinceId+"&kpiId="+kpiId+"&reportSumStartTime="+df.format(new Date(reportSumStartTime))+"&reportSumEndTime="+df.format(new Date(reportSumEndTime)),
dataType : 'text',
beforeSend: function(data) {
},
......
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