Skip to content

C
cmszMonitorAnalysis
Commit 137557ca authored by 胡斌's avatar 胡斌
Browse files
Options

Merge remote-tracking branch 'origin/moly'

# Conflicts: # .idea/workspace.xml # src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class
parents 6a6ee150 38fe000a
Hide whitespace changes
Inline Side-by-side
Showing with 527 additions and 31 deletions
CmszMonitorAnalysis.iml
View file @ 137557ca
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="EclipseModuleManager">
<libelement value="jar://$MODULE_DIR$/src/main/webapp/WEB-INF/lib/xbean-spring-2.8.jar!/" />
<libelement value="jar://$MODULE_DIR$/src/main/webapp/WEB-INF/lib/activation-1.0.0.jar!/" />
......@@ -156,6 +156,7 @@
<facet type="web" name="Web">
<configuration>
<descriptors>
<deploymentDescriptor name="jetty-web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/jetty-web.xml" />
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
</descriptors>
<webroots>
......@@ -163,14 +164,18 @@
</webroots>
</configuration>
</facet>
<facet type="Spring" name="Spring">
<configuration />
</facet>
</component>
<component name="NewModuleRootManager">
<output url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/classes" />
<exclude-output />
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
......@@ -1460,7 +1465,7 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="inheritedJdk" />
<orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
<orderEntry type="module-library">
<library>
<CLASSES>
......@@ -1470,14 +1475,185 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<orderEntry type="library" name="lib" level="project" />
<orderEntry type="library" name="servlet-api" level="application" />
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/servlet-api.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<root url="jar://D:/hg-env7/apache-tomcat-7.0.47/lib/servlet-api.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="Maven: p6spy:p6spy:1.3" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.xfire:xfire-xmpp:1.2.6" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.xfire:xfire-aegis:1.2.6" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.xfire:xfire-core:1.2.6" level="project" />
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
<orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
<orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.1" level="project" />
<orderEntry type="library" name="Maven: jaxen:jaxen:1.1-beta-9" level="project" />
<orderEntry type="library" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
<orderEntry type="library" name="Maven: xerces:xercesImpl:2.6.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.ws.commons:XmlSchema:1.1" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.woodstox:wstx-asl:3.2.0" level="project" />
<orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
<orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.0" level="project" />
<orderEntry type="library" name="Maven: net.java.dev.stax-utils:stax-utils:20040917" level="project" />
<orderEntry type="library" name="Maven: jivesoftware:smackx:1.5.0" level="project" />
<orderEntry type="library" name="Maven: jivesoftware:smack:1.5.0" level="project" />
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.2" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
<orderEntry type="library" name="Maven: org.docx4j:docx4j:3.1.0" level="project" />
<orderEntry type="library" name="Maven: org.plutext:jaxb-svg11:1.0.2" level="project" />
<orderEntry type="library" name="Maven: org.plutext:jaxb-xslfo:1.0.1" level="project" />
<orderEntry type="library" name="Maven: org.plutext:jaxb-xmldsig-core:1.0.0" level="project" />
<orderEntry type="library" name="Maven: net.engio:mbassador:1.1.10" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:xmlgraphics-commons:1.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:fop:1.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svg-dom:1.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-anim:1.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-css:1.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-parser:1.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-util:1.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-js:1.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-xml:1.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-awt-util:1.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-transcoder:1.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svggen:1.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-extension:1.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-ext:1.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.avalon.framework:avalon-framework-api:4.3.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.avalon.framework:avalon-framework-impl:4.3.1" level="project" />
<orderEntry type="library" name="Maven: xalan:xalan:2.7.1" level="project" />
<orderEntry type="library" name="Maven: xalan:serializer:2.7.1" level="project" />
<orderEntry type="library" name="Maven: net.arnx:wmf2svg:0.9.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:3.8" level="project" />
<orderEntry type="library" name="Maven: org.antlr:antlr-runtime:3.3" level="project" />
<orderEntry type="library" name="Maven: org.antlr:stringtemplate:3.2.1" level="project" />
<orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.10-FINAL" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.10-FINAL" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.10-FINAL" level="project" />
<orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.6" level="project" />
<orderEntry type="library" name="Maven: r:REngine:1.1.0" level="project" />
<orderEntry type="library" name="Maven: r:Rserve:1.1.0" level="project" />
<orderEntry type="library" name="Maven: r:Rsession:1.1.0" level="project" />
<orderEntry type="library" name="Maven: org.apache:elasticsearch:1.0.0" level="project" />
<orderEntry type="library" name="Maven: org.apache:lucene-analyzers-common:4.6.1" level="project" />
<orderEntry type="library" name="Maven: org.apache:lucene-core:4.6.1" level="project" />
<orderEntry type="library" name="Maven: org.apache:lucene-highlighter:4.6.1" level="project" />
<orderEntry type="library" name="Maven: org.apache:lucene-join:4.6.1" level="project" />
<orderEntry type="library" name="Maven: org.apache:lucene-queries:4.6.1" level="project" />
<orderEntry type="library" name="Maven: org.apache:lucene-queryparser:4.6.1" level="project" />
<orderEntry type="library" name="Maven: org.apache:lucene-sandbox:4.6.1" level="project" />
<orderEntry type="library" name="Maven: org.apache:elasticsearch-mapper-attachments:2.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springside:springside-core:4.1.0.GA" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.7.3" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.aspectj:aspectjweaver:1.7.3" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:4.2.3.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.1.0.GA" level="project" />
<orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.0-api:1.0.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:4.0.2.Final" level="project" />
<orderEntry type="library" name="Maven: org.javassist:javassist:3.15.0-GA" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-core:4.2.3.Final" level="project" />
<orderEntry type="library" name="Maven: com.hp.service:axis:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.hp.service:activation:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.hp.service:axis-ant:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.hp.service:axis-schema:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.hp.service:commons-discovery-0.2:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.hp.service:commons-logging-1.0.4:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.hp.service:jaxrpc:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.hp.service:mailapi:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.hp.service:saaj:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.hp.service:wsdl4j-1.5.1:1.0.0" level="project" />
<orderEntry type="library" name="Maven: com.hp.service:xmlsec-1.3.0:1.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:3.2.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:3.2.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:3.2.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.3.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.5.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:3.2.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:3.2.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-orm:3.2.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:3.2.3.RELEASE" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.tomcat:tomcat-jdbc:7.0.42" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.tomcat:tomcat-juli:7.0.42" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.hp:vertica:7.0.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:3.2.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:3.2.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:3.2.3.RELEASE" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: opensymphony:sitemesh:2.4.2" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.2.2" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-ehcache:1.2.2" level="project" />
<orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.6.6" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.8" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:4.3.1.Final" level="project" />
<orderEntry type="library" name="Maven: javax.validation:validation-api:1.0.0.GA" level="project" />
<orderEntry type="library" name="Maven: com.google:gson:2.2.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.1.5" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.1.5" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.5" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.1.5" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:1.0.13" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:1.0.13" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:log4j-over-slf4j:1.7.5" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:jcl-over-slf4j:1.7.5" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:jul-to-slf4j:1.7.5" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.bgee.log4jdbc-log4j2:log4jdbc-log4j2-jdbc4:1.15" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:14.0.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springside:springside-test:4.1.0.GA" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.5" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:3.2.3.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.seleniumhq.selenium:selenium-java:2.33.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.seleniumhq.selenium:selenium-chrome-driver:2.33.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:2.33.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.seleniumhq.selenium:selenium-ie-driver:2.33.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.seleniumhq.selenium:selenium-support:2.33.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.webbitserver:webbit:0.4.14" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty:3.5.2.Final" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.seleniumhq.selenium:selenium-remote-driver:2.33.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.json:json:20080701" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.seleniumhq.selenium:selenium-api:2.33.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apache.httpcomponents:httpclient:4.2.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apache.httpcomponents:httpcore:4.2.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apache.commons:commons-exec:1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.java.dev.jna:jna:3.4.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.java.dev.jna:platform:3.4.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.h2database:h2:1.3.172" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty.aggregate:jetty-webapp:7.6.11.v20130520" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty.orbit:javax.servlet:2.5.0.v201103041518" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-jsp:7.6.11.v20130520" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty.orbit:javax.servlet.jsp:2.1.0.v201105211820" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty.orbit:org.apache.jasper.glassfish:2.1.0.v201110031002" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty.orbit:javax.servlet.jsp.jstl:1.2.0.v201105211821" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty.orbit:org.apache.taglibs.standard.glassfish:1.2.0.v201112081803" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty.orbit:javax.el:2.1.0.v201105211819" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty.orbit:com.sun.el:1.0.0.v201105211818" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty.orbit:org.eclipse.jdt.core:3.7.1" level="project" />
<orderEntry type="library" name="Maven: commons-net:commons-net:3.1" level="project" />
<orderEntry type="library" name="Maven: sun.misc:BASE64Decoder:1.0" level="project" />
</component>
</module>
\ No newline at end of file
src/main/java/com/hp/cmsz/entity/XcdWarningInfoView.java
View file @ 137557ca
......@@ -55,7 +55,7 @@ public class XcdWarningInfoView {
private String status;//关闭类型(未关闭,。。。。)
private String workingOrderCode;
private String riskPictureFileName; //隐患图片
private String influenceEndTime; //隐患图片
private String influenceEndTime; //告警结束时间
private Long ifFilter; //隐患图片
private Long dataModelTypeId;
private String dataModelName;
......
src/main/java/com/hp/cmsz/repository/XcdWarningInfoViewDao.java
View file @ 137557ca
......@@ -88,5 +88,10 @@ public interface XcdWarningInfoViewDao extends PagingAndSortingRepository<XcdWa
//协查单分析页面中告警来源选择了“其他”
@Query(value="SELECT TO_CHAR(DATE_VALUE,'yyyy-mm-dd') AS CATEGORY,COUNT(working_order_id) AS COUNT FROM (SELECT DATE_VALUE FROM dim_date_info_t WHERE DATE_VALUE between ?4 and ?5 )A left join(SELECT event_happen_time, working_order_id FROM XCD_WORKING_ORDER_INFO_T s WHERE not exists(select 1 from GJFX_WARNING_INFO_T where RELEVANT_WORKING_ORDER_ID = s.WORKING_ORDER_ID) and prov_code IN ( SELECT PROVINCE_CODE FROM DIM_PROVINCE_INFO_T WHERE PROVINCE_ID IN(?1)) AND channel_id IN(?2) AND data_source_id IN (?3) and provider_id in(?6))B ON A.DATE_VALUE=CAST(B.event_happen_time AS DATE) GROUP BY CATEGORY ORDER BY CATEGORY",nativeQuery=true)//change by eric 2014-08-13 22:07 外连接了日期
List<Object[]> findXcdAnalysisByAllOther(List<Long> proids,List<Long> channelids,List<Long> sourceids,Date startdate,Date enddate,List<Long> provider);
@Query(value = "select infov from XcdWarningInfoView infov where infov.kpiId = :kpiId and infov.provinceId = :provinceId and infov.occurTime >= :occurTime and infov.occurTime <= :closeTime")
List<XcdWarningInfoView> findXcdWarningInfoViewByKpiIdAndProvinceIdandBeginToEndTime(@Param(value = "kpiId")Long kpiId,@Param(value = "provinceId")Long provinceId,
@Param(value = "occurTime")Date occurTime,@Param(value = "closeTime") Date closeTime);
}
src/main/java/com/hp/cmsz/service/monitoroperation/AssociateDiagosisDetailService.java
View file @ 137557ca
......@@ -2,8 +2,11 @@ package com.hp.cmsz.service.monitoroperation;
import com.hp.cmsz.entity.AssociateDiagosisDetail;
import com.hp.cmsz.entity.XcdWarningInfoView;
import com.hp.cmsz.repository.DimAssociationAnaInfoDao;
import com.hp.cmsz.repository.XcdWarningInfoViewDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -14,6 +17,7 @@ import javax.persistence.EntityManagerFactory;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@Service
......@@ -25,6 +29,9 @@ public class AssociateDiagosisDetailService {
@Autowired
private DimAssociationAnaInfoDao dimAssociationAnaInfoDao;
@Autowired
private XcdWarningInfoViewDao xcdWarningInfoViewDao;
/*
public List<AssociateDiagosisDetail> findLastDiagosisDetail() {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd:HH:mm:ss");
......@@ -69,6 +76,10 @@ public class AssociateDiagosisDetailService {
System.out.println(beginTime+","+endTime+","+associationId);
return dimAssociationAnaInfoDao.findDetailByAssociationIdAndWarnBeginToEndTime(beginTime,endTime,associationId);
}
public List<XcdWarningInfoView> findXcdWarningInfoViewByKpiIdAndProvinceIdandBeginToEndTime(Long kpiId, Long provinceId,
Date occurTime, Date closeTime){
return xcdWarningInfoViewDao.findXcdWarningInfoViewByKpiIdAndProvinceIdandBeginToEndTime(kpiId, provinceId, occurTime, closeTime);
}
}
src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java
View file @ 137557ca
......@@ -88,7 +88,6 @@ public class ModelMaintainController {
model.put("deployedServerList", deployedServerList);
model.put("dataTypeList", dataTypeList);
//wei le 测试 自己的判断
return PageURLController.ModelMaintain;
}
......
src/main/java/com/hp/cmsz/web/monitoroperation/AssociateDiagosisDetailController.java
View file @ 137557ca
......@@ -8,6 +8,7 @@ import com.hp.cmsz.repository.*;
import com.hp.cmsz.service.*;
import com.hp.cmsz.service.monitoroperation.*;
import com.hp.cmsz.web.PageURLController;
import net.sf.ehcache.transaction.xa.ExpiredXidTransactionIDImpl;
import org.apache.poi.hssf.usermodel.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
......@@ -218,6 +219,52 @@ public class AssociateDiagosisDetailController {
return PageURLController.AssociateDetails;
}
@RequestMapping("/getDetail")
@ResponseBody
public String getDetail(@RequestParam(value = "kpiId", defaultValue = "") String kpiId,
@RequestParam(value = "provinceId", defaultValue = "")String provinceId,
@RequestParam(value = "beginTime", defaultValue = "")String beginTime,
@RequestParam(value = "endTime", defaultValue = "")String endTime){
if("".equalsIgnoreCase(kpiId.trim())||"".equalsIgnoreCase(provinceId.trim())||
"".equalsIgnoreCase(beginTime.trim())||"".equalsIgnoreCase(endTime.trim())){
return "";
}
Long kpiIdl=null;
Long proviceIdl=null;
Date beginTimeD=null;
Date endTimeD=null;
try{
kpiIdl=Long.parseLong(kpiId.trim());
proviceIdl=Long.parseLong(provinceId.trim());
beginTimeD=strToDate(beginTime.trim());
endTimeD=strToDate(endTime.trim());
}catch (Exception e){
e.printStackTrace();
return "";
}
List<XcdWarningInfoView> list =associateDiagosisDetailService.
findXcdWarningInfoViewByKpiIdAndProvinceIdandBeginToEndTime(kpiIdl,proviceIdl,beginTimeD,endTimeD);
Gson gson=new Gson();
System.out.println(list);
return gson.toJson(list);
}
public static Date strToDate(String str) throws Exception{
SimpleDateFormat sdf = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" );
Date d=new Date();
try {
d=sdf.parse(str);
}catch (Exception e){
throw new Exception("日期格式不对");
}
return d;
}
public static String getOld(){
Calendar calendar=Calendar.getInstance();
......
src/main/webapp/WEB-INF/views/MonitorOperation/AssociateDetails.jsp
View file @ 137557ca
......@@ -23,6 +23,131 @@
<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>
//格式化日期
function Format(){
this.jsjava_class="jsjava.text.Format";
}
function DateFormat(){
this.jsjava_class="jsjava.text.DateFormat";
}
DateFormat.prototype=new Format();
DateFormat.prototype.constructor=DateFormat;
DateFormat.zh_cn_month2=["01","02","03","04","05","06","07","08","09","10","11","12"];
DateFormat.zh_cn_month3=["\u4e00\u6708","\u4e8c\u6708","\u4e09\u6708","\u56db\u6708","\u4e94\u6708","\u516d\u6708","\u4e03\u6708","\u516b\u6708","\u4e5d\u6708","\u5341\u6708","\u5341\u4e00\u6708","\u5341\u4e8c\u6708",];
DateFormat.zh_cn_month4=["\u4e00\u6708","\u4e8c\u6708","\u4e09\u6708","\u56db\u6708","\u4e94\u6708","\u516d\u6708","\u4e03\u6708","\u516b\u6708","\u4e5d\u6708","\u5341\u6708","\u5341\u4e00\u6708","\u5341\u4e8c\u6708",];
DateFormat.en_us_month4=["Janu","Febr","Marc","Apri","May","Juhn","July","Augu","Sept","Octo","Nove","Dece"];
DateFormat.en_us_month3=["Jan","Feb","Mar","Apr","May","Juh","Jul","Aug","Sep","Oct","Nov","Dec"];
DateFormat.en_us_month2=["01","02","03","04","05","06","07","08","09","10","11","12"];
DateFormat.zh_cn_week=["\u661f\u671f\u65e5","\u661f\u671f\u4e00","\u661f\u671f\u4e8c","\u661f\u671f\u4e09","\u661f\u671f\u56db","\u661f\u671f\u4e94","\u661f\u671f\u516d"];
DateFormat.zh_cn_am="\u4e0b\u5348";
DateFormat.zh_cn_pm="\u4e0a\u5348";
DateFormat.language=(navigator.userLanguage==undefined?navigator.language:navigator.userLanguage).replace("-","_").toLowerCase();
DateFormat.prototype.format=function(date){
var year4=date.getFullYear();
var year2=year4.toString().substring(2);
var pattern=this.pattern;
pattern=pattern.replace(/yyyy/,year4);
pattern=pattern.replace(/yy/,year2);
var month=date.getMonth();
pattern=pattern.replace(/MMMM/,eval("DateFormat."+DateFormat.language+"_month4[month]"));
pattern=pattern.replace(/MMM/,eval("DateFormat."+DateFormat.language+"_month3[month]"));
pattern=pattern.replace(/MM/,eval("DateFormat."+DateFormat.language+"_month2[month]"));
var dayOfMonth=date.getDate();
var dayOfMonth2=dayOfMonth;
var dayOfMonthLength=dayOfMonth.toString().length;
if(dayOfMonthLength==1){
dayOfMonth2="0"+dayOfMonth;
}
pattern=pattern.replace(/dd/,dayOfMonth2);
pattern=pattern.replace(/d/,dayOfMonth);
var hours=date.getHours();
var hours2=hours;
var hoursLength=hours.toString().length;
if(hoursLength==1){
hours2="0"+hours;
}
pattern=pattern.replace(/HH/,hours2);
pattern=pattern.replace(/H/,hours);
var minutes=date.getMinutes();
var minutes2=minutes;
var minutesLength=minutes.toString().length;
if(minutesLength==1){
minutes2="0"+minutes;
}
pattern=pattern.replace(/mm/,minutes2);
pattern=pattern.replace(/m/,minutes);
var seconds=date.getSeconds();
var seconds2=seconds;
var secondsLength=seconds.toString().length;
if(secondsLength==1){
seconds2="0"+seconds;
}
pattern=pattern.replace(/ss/,seconds2);
pattern=pattern.replace(/s/,seconds);
var milliSeconds=date.getMilliseconds();
pattern=pattern.replace(/S+/,milliSeconds);
var day=date.getDay();
// pattern=pattern.replace(/E+/,eval("DateFormat."+DateFormat.language+"_week[day]"));
if(hours>12){
pattern=pattern.replace(/a+/,eval("DateFormat."+DateFormat.language+"_am"));
}else{
pattern=pattern.replace(/a+/,eval("DateFormat."+DateFormat.language+"_pm"));
}
var kHours=hours;
if(kHours==0){
kHours=24;
}
var kHours2=kHours;
var kHoursLength=kHours.toString().length;
if(kHoursLength==1){
kHours2="0"+kHours;
}
pattern=pattern.replace(/kk/,kHours2);
pattern=pattern.replace(/k/,kHours);
var KHours=hours;
if(hours>11){
KHours=hours-12;
}
var KHours2=KHours;
var KHoursLength=KHours.toString().length;
if(KHoursLength==1){
KHours2="0"+KHours;
}
pattern=pattern.replace(/KK/,KHours2);
pattern=pattern.replace(/K/,KHours);
var hHours=KHours;
if(hHours==0){
hHours=12;
}
var hHours2=hHours;
var hHoursLength=hHours.toString().length;
if(KHoursLength==1){
hHours2="0"+hHours;
}
pattern=pattern.replace(/hh/,hHours2);
pattern=pattern.replace(/h/,hHours);
return pattern;
};
function SimpleDateFormat(){
this.jsjava_class="jsjava.text.SimpleDateFormat";
}
SimpleDateFormat.prototype=new DateFormat();
SimpleDateFormat.prototype.constructor=SimpleDateFormat;
SimpleDateFormat.prototype.applyPattern=function(pattern){
this.pattern=pattern;
};
var df=new SimpleDateFormat();
df.applyPattern("yyyy-MM-dd HH:mm:ss");
</script>
</head>
<body>
<div>
......@@ -71,22 +196,22 @@
<br>
<table class='table table-vertical'>
<tr>
<th>省份</th>
<th>指标名称</th>
<th>指标编码</th>
<th>类型</th>
<th>名称</th>
<th>告警个数</th>
<th>异常程度</th>
<th>指标告警明细</th>
<th style='vertical-align: middle !important;text-align: center;'>省份</th>
<th style='vertical-align: middle !important;text-align: center;'>指标名称</th>
<th style='vertical-align: middle !important;text-align: center;'>指标编码</th>
<th style='vertical-align: middle !important;text-align: center;'>类型</th>
<th style='vertical-align: middle !important;text-align: center;'>名称</th>
<th style='vertical-align: middle !important;text-align: center;'>告警个数</th>
<th style='vertical-align: middle !important;text-align: center;'>异常程度</th>
<th style='vertical-align: middle !important;text-align: center;'>指标告警明细</th>
</tr>
<c:forEach items="${warningDetailList}" var="item">
<tr>
<td>${item.PROVINCE_NAME}</td>
<td>${item.KPI_NAME}</td>
<td>${item.KPI_CODE}</td>
<td>
<td style='vertical-align: middle !important;text-align: center;'>${item.PROVINCE_NAME}</td>
<td style='vertical-align: middle !important;text-align: center;'>${item.KPI_NAME}</td>
<td style='vertical-align: middle !important;text-align: center;'>${item.KPI_CODE}</td>
<td style='vertical-align: middle !important;text-align: center;'>
<c:if test="${item.ASSOCIATION_TYPE == 'c'}">
业务
</c:if>
......@@ -94,10 +219,12 @@
渠道
</c:if>
</td>
<td>${item.ASSOCIATION_DESC}</td>
<td>${item.WARNING_NUM}</td>
<td>${item.INFLUENCE_LEVEL}</td>
<td><a href="#">告警明细</a></td>
<td style='vertical-align: middle !important;text-align: center;'>${item.ASSOCIATION_DESC}</td>
<td style='vertical-align: middle !important;text-align: center;'>${item.WARNING_NUM}</td>
<td style='vertical-align: middle !important;text-align: center;'>${item.INFLUENCE_LEVEL}</td>
<td style='vertical-align: middle !important;text-align: center;'><a
<%--href="${ctx}/MonitorOperation/AssociateDiagosisDetailgetDetail?kpiId=${item.KPI_ID}&provinceId=${item.PROVINCE_ID}&beginTime=${beginTime}&endTime=${endTime}"--%>
onclick="getdetails(this)" name="${item.KPI_ID}_${item.PROVINCE_ID}_${beginTime}_${endTime}">告警明细</a></td>
</tr>
</c:forEach>
</table>
......@@ -122,6 +249,135 @@
</div>
</div>
</div>
<script>
function getdetails(e){
// alert($(e).name);
var params=e.name.split("_");
var kpiId=params[0];
var proviceId=params[1];
var beginTime=params[2];
var endTime=params[3];
$.dialog({
title:"",
content:"<div id='paramList' class='container' >"+
"<div class='col-xs-12'><div class='panel panel-default'><div class='panel-heading' >指标告警明细</div><div class='panel-body'> <table class='table table-striped table-bordered '> <thead> <tr align='center'> " +
"<th style='vertical-align: middle !important;text-align: center;'>编号</th>" +
"<th style='vertical-align: middle !important;text-align: center;'>省份</th> " +
"<th style='vertical-align: middle !important;text-align: center;' >渠道</th> " +
"<th style='vertical-align: middle !important;text-align: center;' >数据来源</th> " +
"<th style='vertical-align: middle !important;text-align: center;' >告警来源</th>" +
"<th style='vertical-align: middle !important;text-align: center;' >指标</th>" +
"<th style='vertical-align: middle !important;text-align: center;' >告警类型</th>" +
"<th style='vertical-align: middle !important;text-align: center;' >发生时间</th>" +
"<th style='vertical-align: middle !important;text-align: center;' >告警影响结束时间</th>" +
"<th style='vertical-align: middle !important;text-align: center;' >结束时间</th>" +
"<th style='vertical-align: middle !important;text-align: center;' >协查单号</th>" +
"<th style='vertical-align: middle !important;text-align: center;' >故障单号</th>" +
"<th style='vertical-align: middle !important;text-align: center;' >告警状态</th>" +
"<th style='vertical-align: middle !important;text-align: center;' >关闭类型</th>" +
"</tr> </thead> <tbody> </tbody> </table> </div> </div> </div>"+
"</div>",
lock:true,
width:"1200px",
height : "600px",
initialize:function(){
var paramTbody = $('#paramList tbody');
$.ajax({
type : 'GET',
async : false,
contentType : 'application/json',
url: "${ctx}/MonitorOperation/AssociateDiagosisDetail/getDetail?kpiId="+kpiId+"&provinceId="+proviceId+"&beginTime="+beginTime+"&endTime="+endTime,
dataType : 'text',
success: function(data){
var jsonDa=eval('('+data+')');
// console.log("data "+data);
$.each(jsonDa,function(n,val){
// alert(df.format(val.closeTime));
console.log(" val.closeTime "+val.closeTime);
console.log(" df.format(new Date(val.closeTime)) "+df.format(new Date(val.closeTime)));
console.log(" new Date(val.closeTime)) "+new Date(val.closeTime));
var warningId=val.warningId;
if(typeof warningId === 'undefined'){warningId=''}
var provinceName=val.provinceName;
if(typeof provinceName ==='undefined'){provinceName=''}
var channelName=val.channelName;
if(typeof channelName ==='undefined'){channelName=''}
var dataSourceName=val.dataSourceName;
if(typeof dataSourceName ==='undefined'){dataSourceName=''}
var warningSourceName=val.warningSourceName;
if(typeof warningSourceName ==='undefined'){warningSourceName=''}
var kpiName=val.dataSourceName;
if(typeof kpiName ==='undefined'){kpiName=''}
var riskEarlyWarningTypeName=val.riskEarlyWarningTypeName;
if(typeof riskEarlyWarningTypeName ==='undefined'){riskEarlyWarningTypeName=''}
var occurTime=val.occurTime;
if(typeof occurTime ==='undefined'){occurTime=''}else{ occurTime=df.format(new Date(val.occurTime));}
var influenceEndTime=val.influenceEndTime;
if(typeof influenceEndTime ==='undefined'){influenceEndTime=''}
var closeTime=val.closeTime;
if(typeof closeTime ==='undefined'){closeTime=''}else{closeTime=df.format(new Date(val.closeTime));}
var dataSourceName=val.dataSourceName;
if(typeof dataSourceName ==='undefined'){dataSourceName=''}
var relevantWorkingOrderId= val.relevantWorkingOrderId;
if(typeof relevantWorkingOrderId === 'undefined' ){relevantWorkingOrderId=''}
var relevantFailureId=val.relevantFailureId;
if( typeof relevantFailureId === 'undefined' ){relevantFailureId=''}
var type=val.type;
if( typeof type === 'undefined' ){type=''}
var status=val.status;
if( typeof status === 'undefined' ){status=''}
paramTbody.append($("<tr align='center' ></tr>")
.append("<td style='vertical-align: middle !important;text-align: center;' '><a>"+warningId+"</a></td>")
.append("<td style='vertical-align: middle !important;text-align: center;' >"+provinceName+"</td>")
.append("<td style='vertical-align: middle !important;text-align: center;' >"+channelName+"</td>")
.append("<td style='vertical-align: middle !important;text-align: center;' >"+dataSourceName+"</td>")
.append("<td style='vertical-align: middle !important;text-align: center;' >"+warningSourceName+"</td>")
.append("<td style='vertical-align: middle !important;text-align: center;' >"+kpiName+"</td>")
.append("<td style='vertical-align: middle !important;text-align: center;' >"+riskEarlyWarningTypeName+"</td>")
.append("<td style='vertical-align: middle !important;text-align: center;' >"+occurTime+"</td>")
.append("<td style='vertical-align: middle !important;text-align: center;' >"+influenceEndTime+"</td>")
.append("<td style='vertical-align: middle !important;text-align: center;' >"+closeTime+"</td>")
.append("<td style='vertical-align: middle !important;text-align: center;' >"+relevantWorkingOrderId+"</td>")
.append("<td style='vertical-align: middle !important;text-align: center;' >"+relevantFailureId+"</td>")
.append("<td style='vertical-align: middle !important;text-align: center;' >"+type+"</td>")
.append("<td style='vertical-align: middle !important;text-align: center;' >"+status+"</td>")
);
});
//关闭类型 status
// 告警状态 type
//级别 imporiance_level_name
//数据来源 data_source_name
//告警来源 waringing_source_name
//告警类型 risk_early_warning_type_name
}
});
}
});
}
</script>
</body>
</html>
src/main/webapp/static/js/associatediagosisdetail.js
View file @ 137557ca
function initTable(){
jsonStr = document.getElementById('gzfxDetail').value;
// alert("jsonStr" +jsonStr);
var header = new Array();
......
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