Commit 53f3bc53 authored by 莫林毅's avatar 莫林毅

监控运营/协查单管理/协查单明细

增加 字段 '分析报告'
parent dc519c05
...@@ -3,18 +3,12 @@ package com.hp.cmsz.entity; ...@@ -3,18 +3,12 @@ package com.hp.cmsz.entity;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import javax.persistence.Entity; import javax.persistence.*;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
/** /**
*xcd_detail_info_v对应的实体类 * xcd_detail_info_v对应的实体类
* *
* @author Eric * @author Eric
*
*/ */
@Entity @Entity
@Table(name = "xcd_detail_info_v") @Table(name = "xcd_detail_info_v")
...@@ -41,8 +35,8 @@ public class XcdDetailInfoView implements Serializable{ ...@@ -41,8 +35,8 @@ public class XcdDetailInfoView implements Serializable{
private String woReasonType;//协查原因类别 private String woReasonType;//协查原因类别
private String woReasonSubTypeOne;//协查原因子类一 private String woReasonSubTypeOne;//协查原因子类一
private String woReasonSubTypeTwo;//协查原因子类二 private String woReasonSubTypeTwo;//协查原因子类二
/* private Long woReasonSubTypeId;//协查原因子类二ID /* private Long woReasonSubTypeId;//协查原因子类二ID
*/ private String proposedResolution;//省公司解决方案 */ private String proposedResolution;//省公司解决方案
private Long relevantFailureId;// 相关的故障ID private Long relevantFailureId;// 相关的故障ID
private String warningSourceName;//告警来源 private String warningSourceName;//告警来源
private Long warningSourceId;//告警来源Id private Long warningSourceId;//告警来源Id
...@@ -65,7 +59,7 @@ public class XcdDetailInfoView implements Serializable{ ...@@ -65,7 +59,7 @@ public class XcdDetailInfoView implements Serializable{
private Long dataSourceId;// private Long dataSourceId;//
private String dataSourceName; private String dataSourceName;
private char ifReportFile;
// private Long importanceLevelId; // private Long importanceLevelId;
...@@ -80,233 +74,308 @@ public class XcdDetailInfoView implements Serializable{ ...@@ -80,233 +74,308 @@ public class XcdDetailInfoView implements Serializable{
@Id @Id
@GeneratedValue(strategy=GenerationType.SEQUENCE, generator="XcdWorkingOrderViewSequence") @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "XcdWorkingOrderViewSequence")
@SequenceGenerator(name = "XcdWorkingOrderViewSequence", sequenceName = "xcd_working_order_info_v_seq", allocationSize=20) @SequenceGenerator(name = "XcdWorkingOrderViewSequence", sequenceName = "xcd_working_order_info_v_seq", allocationSize = 20)
public Long getWorkingOrderId() { public Long getWorkingOrderId() {
return workingOrderId; return workingOrderId;
} }
public void setWorkingOrderId(Long workingOrderId) { public void setWorkingOrderId(Long workingOrderId) {
this.workingOrderId = workingOrderId; this.workingOrderId = workingOrderId;
} }
public String getProvCode() { public String getProvCode() {
return provCode; return provCode;
} }
public void setProvCode(String provCode) { public void setProvCode(String provCode) {
this.provCode = provCode; this.provCode = provCode;
} }
public String getAskname() { public String getAskname() {
return askname; return askname;
} }
public void setAskname(String askname) { public void setAskname(String askname) {
this.askname = askname; this.askname = askname;
} }
public String getSuborigin() { public String getSuborigin() {
return suborigin; return suborigin;
} }
public void setSuborigin(String suborigin) { public void setSuborigin(String suborigin) {
this.suborigin = suborigin; this.suborigin = suborigin;
} }
public String getPriority() { public String getPriority() {
return priority; return priority;
} }
public void setPriority(String priority) { public void setPriority(String priority) {
this.priority = priority; this.priority = priority;
} }
public String getResolvingStatus() { public String getResolvingStatus() {
return resolvingStatus; return resolvingStatus;
} }
public void setResolvingStatus(String resolvingStatus) { public void setResolvingStatus(String resolvingStatus) {
this.resolvingStatus = resolvingStatus; this.resolvingStatus = resolvingStatus;
} }
public String getIncidence() { public String getIncidence() {
return incidence; return incidence;
} }
public void setIncidence(String incidence) { public void setIncidence(String incidence) {
this.incidence = incidence; this.incidence = incidence;
} }
public String getWorkingOrderCode() { public String getWorkingOrderCode() {
return workingOrderCode; return workingOrderCode;
} }
public void setWorkingOrderCode(String workingOrderCode) { public void setWorkingOrderCode(String workingOrderCode) {
this.workingOrderCode = workingOrderCode; this.workingOrderCode = workingOrderCode;
} }
public String getWorkingOrderTitle() { public String getWorkingOrderTitle() {
return workingOrderTitle; return workingOrderTitle;
} }
public void setWorkingOrderTitle(String workingOrderTitle) { public void setWorkingOrderTitle(String workingOrderTitle) {
this.workingOrderTitle = workingOrderTitle; this.workingOrderTitle = workingOrderTitle;
} }
public String getWorkingOrderDescription() { public String getWorkingOrderDescription() {
return workingOrderDescription; return workingOrderDescription;
} }
public void setWorkingOrderDescription(String workingOrderDescription) { public void setWorkingOrderDescription(String workingOrderDescription) {
this.workingOrderDescription = workingOrderDescription; this.workingOrderDescription = workingOrderDescription;
} }
public String getAffectregion() { public String getAffectregion() {
return affectregion; return affectregion;
} }
public void setAffectregion(String affectregion) { public void setAffectregion(String affectregion) {
this.affectregion = affectregion; this.affectregion = affectregion;
} }
public String getProvinceName() { public String getProvinceName() {
return provinceName; return provinceName;
} }
public void setProvinceName(String provinceName) { public void setProvinceName(String provinceName) {
this.provinceName = provinceName; this.provinceName = provinceName;
} }
public Long getProvinceId() { public Long getProvinceId() {
return provinceId; return provinceId;
} }
public void setProvinceId(Long provinceId) { public void setProvinceId(Long provinceId) {
this.provinceId = provinceId; this.provinceId = provinceId;
} }
public Date getEventHappenTime() { public Date getEventHappenTime() {
return eventHappenTime; return eventHappenTime;
} }
public void setEventHappenTime(Date eventHappenTime) { public void setEventHappenTime(Date eventHappenTime) {
this.eventHappenTime = eventHappenTime; this.eventHappenTime = eventHappenTime;
} }
public Date getBusinessRecoveryTime() { public Date getBusinessRecoveryTime() {
return businessRecoveryTime; return businessRecoveryTime;
} }
public void setBusinessRecoveryTime(Date businessRecoveryTime) { public void setBusinessRecoveryTime(Date businessRecoveryTime) {
this.businessRecoveryTime = businessRecoveryTime; this.businessRecoveryTime = businessRecoveryTime;
} }
public Date getEventCompletionTimeline() { public Date getEventCompletionTimeline() {
return eventCompletionTimeline; return eventCompletionTimeline;
} }
public void setEventCompletionTimeline(Date eventCompletionTimeline) { public void setEventCompletionTimeline(Date eventCompletionTimeline) {
this.eventCompletionTimeline = eventCompletionTimeline; this.eventCompletionTimeline = eventCompletionTimeline;
} }
public Date getActualCompletionTime() { public Date getActualCompletionTime() {
return actualCompletionTime; return actualCompletionTime;
} }
public void setActualCompletionTime(Date actualCompletionTime) { public void setActualCompletionTime(Date actualCompletionTime) {
this.actualCompletionTime = actualCompletionTime; this.actualCompletionTime = actualCompletionTime;
} }
public String getWoReasonType() { public String getWoReasonType() {
return woReasonType; return woReasonType;
} }
public void setWoReasonType(String woReasonType) { public void setWoReasonType(String woReasonType) {
this.woReasonType = woReasonType; this.woReasonType = woReasonType;
} }
public String getWoReasonSubTypeOne() { public String getWoReasonSubTypeOne() {
return woReasonSubTypeOne; return woReasonSubTypeOne;
} }
public void setWoReasonSubTypeOne(String woReasonSubTypeOne) { public void setWoReasonSubTypeOne(String woReasonSubTypeOne) {
this.woReasonSubTypeOne = woReasonSubTypeOne; this.woReasonSubTypeOne = woReasonSubTypeOne;
} }
public String getWoReasonSubTypeTwo() { public String getWoReasonSubTypeTwo() {
return woReasonSubTypeTwo; return woReasonSubTypeTwo;
} }
public void setWoReasonSubTypeTwo(String woReasonSubTypeTwo) { public void setWoReasonSubTypeTwo(String woReasonSubTypeTwo) {
this.woReasonSubTypeTwo = woReasonSubTypeTwo; this.woReasonSubTypeTwo = woReasonSubTypeTwo;
} }
public String getProposedResolution() { public String getProposedResolution() {
return proposedResolution; return proposedResolution;
} }
public void setProposedResolution(String proposedResolution) { public void setProposedResolution(String proposedResolution) {
this.proposedResolution = proposedResolution; this.proposedResolution = proposedResolution;
} }
public Long getRelevantFailureId() { public Long getRelevantFailureId() {
return relevantFailureId; return relevantFailureId;
} }
public void setRelevantFailureId(Long relevantFailureId) { public void setRelevantFailureId(Long relevantFailureId) {
this.relevantFailureId = relevantFailureId; this.relevantFailureId = relevantFailureId;
} }
public String getWarningSourceName() { public String getWarningSourceName() {
return warningSourceName; return warningSourceName;
} }
public void setWarningSourceName(String warningSourceName) { public void setWarningSourceName(String warningSourceName) {
this.warningSourceName = warningSourceName; this.warningSourceName = warningSourceName;
} }
public Long getWarningSourceId() { public Long getWarningSourceId() {
return warningSourceId; return warningSourceId;
} }
public void setWarningSourceId(Long warningSourceId) { public void setWarningSourceId(Long warningSourceId) {
this.warningSourceId = warningSourceId; this.warningSourceId = warningSourceId;
} }
public String getChannelName() { public String getChannelName() {
return channelName; return channelName;
} }
public void setChannelName(String channelName) { public void setChannelName(String channelName) {
this.channelName = channelName; this.channelName = channelName;
} }
public Long getChannelId() { public Long getChannelId() {
return channelId; return channelId;
} }
public void setChannelId(Long channelId) { public void setChannelId(Long channelId) {
this.channelId = channelId; this.channelId = channelId;
} }
public String getFailureReason() { public String getFailureReason() {
return failureReason; return failureReason;
} }
public void setFailureReason(String failureReason) { public void setFailureReason(String failureReason) {
this.failureReason = failureReason; this.failureReason = failureReason;
} }
public String getOccurReason() { public String getOccurReason() {
return occurReason; return occurReason;
} }
public void setOccurReason(String occurReason) { public void setOccurReason(String occurReason) {
this.occurReason = occurReason; this.occurReason = occurReason;
} }
public Long getReasonTypeId() { public Long getReasonTypeId() {
return reasonTypeId; return reasonTypeId;
} }
public void setReasonTypeId(Long reasonTypeId) { public void setReasonTypeId(Long reasonTypeId) {
this.reasonTypeId = reasonTypeId; this.reasonTypeId = reasonTypeId;
} }
public String getReasonTypeName() { public String getReasonTypeName() {
return reasonTypeName; return reasonTypeName;
} }
public void setReasonTypeName(String reasonTypeName) { public void setReasonTypeName(String reasonTypeName) {
this.reasonTypeName = reasonTypeName; this.reasonTypeName = reasonTypeName;
} }
public String getReasonSubTypeName() { public String getReasonSubTypeName() {
return reasonSubTypeName; return reasonSubTypeName;
} }
public void setReasonSubTypeName(String reasonSubTypeName) { public void setReasonSubTypeName(String reasonSubTypeName) {
this.reasonSubTypeName = reasonSubTypeName; this.reasonSubTypeName = reasonSubTypeName;
} }
public String getDetailedReason() { public String getDetailedReason() {
return detailedReason; return detailedReason;
} }
public void setDetailedReason(String detailedReason) { public void setDetailedReason(String detailedReason) {
this.detailedReason = detailedReason; this.detailedReason = detailedReason;
} }
public String getSolution() { public String getSolution() {
return solution; return solution;
} }
public void setSolution(String solution) { public void setSolution(String solution) {
this.solution = solution; this.solution = solution;
} }
public Long getImportanceLevelId() { public Long getImportanceLevelId() {
return importanceLevelId; return importanceLevelId;
} }
public void setImportanceLevelId(Long importanceLevelId) { public void setImportanceLevelId(Long importanceLevelId) {
this.importanceLevelId = importanceLevelId; this.importanceLevelId = importanceLevelId;
} }
public String getImportanceLevelName() { public String getImportanceLevelName() {
return importanceLevelName; return importanceLevelName;
} }
public void setImportanceLevelName(String importanceLevelName) { public void setImportanceLevelName(String importanceLevelName) {
this.importanceLevelName = importanceLevelName; this.importanceLevelName = importanceLevelName;
} }
public Long getProviderId() { public Long getProviderId() {
return providerId; return providerId;
} }
public void setProviderId(Long providerId) { public void setProviderId(Long providerId) {
this.providerId = providerId; this.providerId = providerId;
} }
public String getProviderName() { public String getProviderName() {
return providerName; return providerName;
} }
public void setProviderName(String providerName) { public void setProviderName(String providerName) {
this.providerName = providerName; this.providerName = providerName;
} }
public Long getDataSourceId() { public Long getDataSourceId() {
return dataSourceId; return dataSourceId;
} }
public void setDataSourceId(Long dataSourceId) { public void setDataSourceId(Long dataSourceId) {
this.dataSourceId = dataSourceId; this.dataSourceId = dataSourceId;
} }
...@@ -314,13 +383,25 @@ public class XcdDetailInfoView implements Serializable{ ...@@ -314,13 +383,25 @@ public class XcdDetailInfoView implements Serializable{
public String getIfGeneratedBySystem() { public String getIfGeneratedBySystem() {
return ifGeneratedBySystem; return ifGeneratedBySystem;
} }
public void setIfGeneratedBySystem(String ifGeneratedBySystem) { public void setIfGeneratedBySystem(String ifGeneratedBySystem) {
this.ifGeneratedBySystem = ifGeneratedBySystem; this.ifGeneratedBySystem = ifGeneratedBySystem;
} }
public String getDataSourceName() { public String getDataSourceName() {
return dataSourceName; return dataSourceName;
} }
public void setDataSourceName(String dataSourceName) { public void setDataSourceName(String dataSourceName) {
this.dataSourceName = dataSourceName; this.dataSourceName = dataSourceName;
} }
@Column(name = "If_Report_file")
public char getIfReportFile() {
return ifReportFile;
}
public void setIfReportFile(char ifReportFile) {
this.ifReportFile = ifReportFile;
}
} }
...@@ -83,6 +83,10 @@ public interface BusinessDao extends JpaSpecificationExecutor<Business>, ...@@ -83,6 +83,10 @@ public interface BusinessDao extends JpaSpecificationExecutor<Business>,
@Query("select business from Business business where business.isActive = :isActived and business.channelDataSourceMapId in (:channelDataSourceMapIdList)") @Query("select business from Business business where business.isActive = :isActived and business.channelDataSourceMapId in (:channelDataSourceMapIdList)")
public List<Business> findBusinessListBychannelDataSourceMapIdListAndIsActived(@Param(value = "channelDataSourceMapIdList") List<Long>channelDataSourceMapIdList,@Param(value = "isActived") String isActived); public List<Business> findBusinessListBychannelDataSourceMapIdListAndIsActived(@Param(value = "channelDataSourceMapIdList") List<Long>channelDataSourceMapIdList,@Param(value = "isActived") String isActived);
@Query(value = "select business_id,business_name from dim_business_info_t where business_id in( select distinct business_id from etl.run_task_t a ) and IS_ACTIVE= :isActived and CHANNEL_DATA_SOURCE_MAP_ID in (:channelDataSourceMapIdList)" ,nativeQuery =true )
public List<Object[]> findBusinessListBychannelDataSourceMapIdListAndIsActived2(
@Param(value = "channelDataSourceMapIdList") List<Long>channelDataSourceMapIdList,
@Param(value = "isActived") String isActived);
} }
...@@ -33,6 +33,11 @@ public interface DimKpiDao extends JpaSpecificationExecutor<DimKpi>, ...@@ -33,6 +33,11 @@ public interface DimKpiDao extends JpaSpecificationExecutor<DimKpi>,
public List<DimKpi> findDimKpiListBybusnameIdList(@Param(value = "busnameIdList") List<Long>busnameIdList); public List<DimKpi> findDimKpiListBybusnameIdList(@Param(value = "busnameIdList") List<Long>busnameIdList);
//本语句 所对应的表非 本实体类对应的表 [临时加]
@Query(value = "select kpi_name,kpi_id from dim_kpi_info_t where business_id in (:busnameIdList) and IS_ACTIVE= :isActive ",nativeQuery = true)
public List<Object[]> findDimKpiListBybusnameIdList2(@Param(value = "busnameIdList") List<Long>busnameIdList,
@Param(value = "isActive")String isActive);
@Query("select dimKpi from DimKpi dimKpi where dimKpi.kpiId in (:kpiIdList)") @Query("select dimKpi from DimKpi dimKpi where dimKpi.kpiId in (:kpiIdList)")
public List<DimKpi> findDimKpiListBykpiIdList(@Param(value = "kpiIdList") List<Long>kpiIdList); public List<DimKpi> findDimKpiListBykpiIdList(@Param(value = "kpiIdList") List<Long>kpiIdList);
......
...@@ -20,25 +20,52 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -20,25 +20,52 @@ import org.springframework.transaction.annotation.Transactional;
import com.hp.cmsz.entity.XcdDetailInfoView; import com.hp.cmsz.entity.XcdDetailInfoView;
import com.hp.cmsz.entity.XcdWorkingOrderInfo; import com.hp.cmsz.entity.XcdWorkingOrderInfo;
public interface XcdDetailInfoViewDao extends PagingAndSortingRepository<XcdDetailInfoView,Long>,JpaSpecificationExecutor<XcdDetailInfoView> { public interface XcdDetailInfoViewDao extends PagingAndSortingRepository<XcdDetailInfoView, Long>, JpaSpecificationExecutor<XcdDetailInfoView> {
//根绝筛选条件从视图中去查找符合条件的协查单 //根绝筛选条件从视图中去查找符合条件的协查单
// List <XcdDetailInfoView> findDistinctWorkingOrderIdByEventHappenTimeBetweenAndChannelIdInAndWarningSourceIdInAndIncidenceInAndProvinceIdInOrderByEventHappenTimeDesc(Date time1,Date time2,Long[] channel, Long[] source,String[] level,Long[] province); // List <XcdDetailInfoView> findDistinctWorkingOrderIdByEventHappenTimeBetweenAndChannelIdInAndWarningSourceIdInAndIncidenceInAndProvinceIdInOrderByEventHappenTimeDesc(Date time1,Date time2,Long[] channel, Long[] source,String[] level,Long[] province);
@Query("from XcdDetailInfoView where eventHappenTime between ?1 AND ?2 and providerId in(?3) " + @Query("from XcdDetailInfoView where eventHappenTime between ?1 AND ?2 and providerId in(?3) " +
"and dataSourceId in(?4) and channelId in(?5) and " + "and dataSourceId in(?4) and channelId in(?5) and " +
"warningSourceId in(?6) and importanceLevelId in(?7) and provinceId in(?8) order by eventHappenTime desc") "warningSourceId in(?6) and importanceLevelId in(?7) and provinceId in(?8) order by eventHappenTime desc")
List <XcdDetailInfoView> findAllOrderByTimeAndAll List<XcdDetailInfoView> findAllOrderByTimeAndAll
(Date time1,Date time2,List<Long> provider,List<Long> datasource,List<Long> channel, List<Long> source,List<Long> level,List<Long> province); (Date time1, Date time2, List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> source, List<Long> level, List<Long> province);
@Query("from XcdDetailInfoView where eventHappenTime between ?1 AND ?2 and providerId in(?3) " +
"and dataSourceId in(?4) and channelId in(?5) and " +
"warningSourceId in(?6) and importanceLevelId in(?7) and provinceId in(?8) and ifReportFile = (?9) order by eventHappenTime desc")
List<XcdDetailInfoView> findAllOrderByTimeAndAll1
(Date time1, Date time2, List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> source, List<Long> level, List<Long> province,char report);
//根绝筛选条件从视图中去查找符合条件的协查单(增加了告警来源为“其他”的筛选项) //根绝筛选条件从视图中去查找符合条件的协查单(增加了告警来源为“其他”的筛选项)
List <XcdDetailInfoView> findWorkingOrderIdDistinctByProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndWorkingOrderIdInOrderByEventHappenTimeDesc(List<Long> provider,List<Long> datasource,List<Long> channel,List<Long> province, List<Long> workingorderids); List<XcdDetailInfoView> findWorkingOrderIdDistinctByProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndWorkingOrderIdInOrderByEventHappenTimeDesc(List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> province, List<Long> workingorderids);
@Query("select distinct infoView from XcdDetailInfoView infoView where infoView.providerId in (?1) and infoView.dataSourceId in (?2) " +
" and infoView.channelId in (?3) and infoView.provinceId in (?4) and infoView.workingOrderId in (?5) " +
" and infoView.ifReportFile = (?6)")
List<XcdDetailInfoView>
findWorkingOrderIdDistinctByProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndWorkingOrderIdInAndReportOrderByEventHappenTimeDesc(
List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> province, List<Long> workingorderids,char report);
//告警来源和告警级别同时全选就不再关联告警 //告警来源和告警级别同时全选就不再关联告警
List <XcdDetailInfoView> findWorkingOrderIdDistinctByEventHappenTimeBetweenAndProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInOrderByEventHappenTimeDesc(Date time1,Date time2,List<Long> provider,List<Long> datasource,List<Long> channel,List<Long> province);
List<XcdDetailInfoView> findWorkingOrderIdDistinctByEventHappenTimeBetweenAndProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInOrderByEventHappenTimeDesc(Date time1, Date time2, List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> province);
@Query("select infoView from XcdDetailInfoView infoView where infoView.eventHappenTime between ?1 and ?2 and" +
" infoView.providerId in (?3) and infoView.dataSourceId in (?4) and infoView.channelId in (?5) and" +
" infoView.provinceId in (?6) and infoView.ifReportFile = (?7) order by infoView.eventHappenTime desc ")
List<XcdDetailInfoView>
findWorkingOrderIdDistinctByEventHappenTimeBetweenAndProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdAndReportInOrderByEventHappenTimeDesc(
Date time1, Date time2, List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> province, char report);
//end //end
//有协查单ID得到协查单 //有协查单ID得到协查单
List <XcdDetailInfoView>findDistinctWorkingOrderIdByWorkingOrderId(Long workingOrderId); List<XcdDetailInfoView> findDistinctWorkingOrderIdByWorkingOrderId(Long workingOrderId);
//有协查单ID得到协查单 || modify by August //有协查单ID得到协查单 || modify by August
...@@ -49,97 +76,108 @@ public interface XcdDetailInfoViewDao extends PagingAndSortingRepository<XcdDet ...@@ -49,97 +76,108 @@ public interface XcdDetailInfoViewDao extends PagingAndSortingRepository<XcdDet
//根据筛选条件以及未标记为故障从视图中去查找符合条件的协查单 || Add by August //根据筛选条件以及未标记为故障从视图中去查找符合条件的协查单 || Add by August
// List <XcdDetailInfoView> findWorkingOrderIdDistinctByEventHappenTimeBetweenAndChannelIdInAndWarningSourceIdInAndIncidenceInAndProvinceIdInAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(Date startTime, Date endTime, List<Long> channel, List<Long> warningSource, List<String> level, List<Long> province); // List <XcdDetailInfoView> findWorkingOrderIdDistinctByEventHappenTimeBetweenAndChannelIdInAndWarningSourceIdInAndIncidenceInAndProvinceIdInAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(Date startTime, Date endTime, List<Long> channel, List<Long> warningSource, List<String> level, List<Long> province);
List <XcdDetailInfoView> findWorkingOrderIdDistinctByEventHappenTimeBetweenAndProviderIdInAndDataSourceIdInAndChannelIdInAndWarningSourceIdInAndImportanceLevelIdInAndProvinceIdInAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(Date startTime,Date endTime,List<Long> provider,List<Long> datasource,List<Long> channel, List<Long> source,List<Long> level,List<Long> province); List<XcdDetailInfoView> findWorkingOrderIdDistinctByEventHappenTimeBetweenAndProviderIdInAndDataSourceIdInAndChannelIdInAndWarningSourceIdInAndImportanceLevelIdInAndProvinceIdInAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(Date startTime, Date endTime, List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> source, List<Long> level, List<Long> province);
//List <XcdDetailInfoView> findByEventHappenTimeBetweenAndChannelIdInAndWarningSourceIdInAndIncidenceInAndProvinceIdInAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(Date startTime, Date endTime, List<Long> channel, List<Long> warningSource, List<String> level, List<Long> province); //List <XcdDetailInfoView> findByEventHappenTimeBetweenAndChannelIdInAndWarningSourceIdInAndIncidenceInAndProvinceIdInAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(Date startTime, Date endTime, List<Long> channel, List<Long> warningSource, List<String> level, List<Long> province);
//根据协查单ID得到数据来源和渠道 add by August //根据协查单ID得到数据来源和渠道 add by August
@Query(value="select xcd.dataSourceName, xcd.channelName from XcdDetailInfoView xcd where xcd.dataSourceId is not null and xcd.channelId is not null and xcd.workingOrderId in (:xcdIds)",nativeQuery=true) @Query(value = "select xcd.dataSourceName, xcd.channelName from XcdDetailInfoView xcd where xcd.dataSourceId is not null and xcd.channelId is not null and xcd.workingOrderId in (:xcdIds)", nativeQuery = true)
List<Object[]> getDataSourceNameAndChannelNameByXcdId(@Param("xcdIds")List<Long> xcdIds); List<Object[]> getDataSourceNameAndChannelNameByXcdId(@Param("xcdIds") List<Long> xcdIds);
//根据协查单找最小的发生时间 //根据协查单找最小的发生时间
@Query("select min(xcd.eventHappenTime),max(xcd.actualCompletionTime) from XcdDetailInfoView xcd where xcd.workingOrderId in (:xcdIds)") @Query("select min(xcd.eventHappenTime),max(xcd.actualCompletionTime) from XcdDetailInfoView xcd where xcd.workingOrderId in (:xcdIds)")
List<Object[]> getXcdMinTimeAndMaxTimeByXcdIds(@Param("xcdIds")List<Long> xcdIds); List<Object[]> getXcdMinTimeAndMaxTimeByXcdIds(@Param("xcdIds") List<Long> xcdIds);
//查询时间范围内没有关联告警的其他协查单id(告警来源增加了其他的筛选) //查询时间范围内没有关联告警的其他协查单id(告警来源增加了其他的筛选)
@Query(value="select 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 EVENT_HAPPEN_TIME between (?1) and (?2);",nativeQuery=true) @Query(value = "select 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 EVENT_HAPPEN_TIME between (?1) and (?2);", nativeQuery = true)
List<Long>getNotRelWorkingorderId(Date time1,Date time2); List<Long> getNotRelWorkingorderId(Date time1, Date time2);
@Query(value="select 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 EVENT_HAPPEN_TIME between (?1) and (?2);",nativeQuery=true)
List<BigInteger>getNotRelBigWorkingorderId(Date time1,Date time2); @Query(value = "select 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 EVENT_HAPPEN_TIME between (?1) and (?2);", nativeQuery = true)
List<BigInteger> getNotRelBigWorkingorderId(Date time1, Date time2);
//查询时间范围内没有关联告警的其他协查单id(告警来源增加了其他的筛选,针对于时间的钻取) //查询时间范围内没有关联告警的其他协查单id(告警来源增加了其他的筛选,针对于时间的钻取)
@Query(value="select 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 EVENT_HAPPEN_TIME >= Date(?1) < Date(?1 )+1;",nativeQuery=true) @Query(value = "select 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 EVENT_HAPPEN_TIME >= Date(?1) < Date(?1 )+1;", nativeQuery = true)
List<Long>getNotRelWorkingorderIdTime(Date time1); List<Long> getNotRelWorkingorderIdTime(Date time1);
//默认页面中查找出所有的协查单并按照eventHappenTime降序排列 //默认页面中查找出所有的协查单并按照eventHappenTime降序排列
@Query("from XcdDetailInfoView where eventHappenTime between TIMESTAMPADD(M,-1,GETDATE()) AND GETDATE() and dataSourceId is not null and providerId is not null and channelId is not null and provinceId is not null order by eventHappenTime desc") //默认页面加了几个not null add by Eric 2014-08-13 20:37 @Query("from XcdDetailInfoView where eventHappenTime between TIMESTAMPADD(M,-1,GETDATE()) AND GETDATE() and dataSourceId is not null and providerId is not null and channelId is not null and provinceId is not null order by eventHappenTime desc")
// List<XcdDetailInfoView> findAllOrder(Date begintime,Date endtime);
List<XcdDetailInfoView> findAllOrderByTime(); List<XcdDetailInfoView> findAllOrderByTime();
//从首页钻取到协查单明细(查找的是非关闭的系统生成的) //从首页钻取到协查单明细(查找的是非关闭的系统生成的)
@Query("from XcdDetailInfoView where ifGeneratedBySystem ='Y' and ( resolvingStatus <>'关闭' or resolvingStatus is null ) order by eventHappenTime desc") @Query("from XcdDetailInfoView where ifGeneratedBySystem ='Y' and ( resolvingStatus <>'关闭' or resolvingStatus is null ) order by eventHappenTime desc")
List<XcdDetailInfoView> findAllUncloseIfSystemOrderByTime(); List<XcdDetailInfoView> findAllUncloseIfSystemOrderByTime();
//协查单分析默认页面的省份钻取 //协查单分析默认页面的省份钻取
@Query("from XcdDetailInfoView where eventHappenTime between TIMESTAMPADD(M,-1,GETDATE()) AND GETDATE() and provinceName in(?1) order by eventHappenTime desc") @Query("from XcdDetailInfoView where eventHappenTime between TIMESTAMPADD(M,-1,GETDATE()) AND GETDATE() and provinceName in(?1) order by eventHappenTime desc")
// List<XcdDetailInfoView> findAllOrder(Date begintime,Date endtime); // List<XcdDetailInfoView> findAllOrder(Date begintime,Date endtime);
List<XcdDetailInfoView> findAllOrderByTimeAndProvince(String provincename); List<XcdDetailInfoView> findAllOrderByTimeAndProvince(String provincename);
//协查单分析默认页面的集成商钻取/改为事件子来源的钻取 //协查单分析默认页面的集成商钻取/改为事件子来源的钻取
@Query("from XcdDetailInfoView where eventHappenTime between TIMESTAMPADD(M,-1,GETDATE()) AND GETDATE() and suborigin in(?1) order by eventHappenTime desc") @Query("from XcdDetailInfoView where eventHappenTime between TIMESTAMPADD(M,-1,GETDATE()) AND GETDATE() and suborigin in(?1) order by eventHappenTime desc")
// List<XcdDetailInfoView> findAllOrder(Date begintime,Date endtime); // List<XcdDetailInfoView> findAllOrder(Date begintime,Date endtime);
List<XcdDetailInfoView> findAllOrderByTimeAndSuborigin(String suborigin); List<XcdDetailInfoView> findAllOrderByTimeAndSuborigin(String suborigin);
//协查单分析提交条件的集成商钻取/改为事件子来源的钻取 //协查单分析提交条件的集成商钻取/改为事件子来源的钻取
@Query("from XcdDetailInfoView where eventHappenTime between ?1 AND ?2 and providerId in(?3) and dataSourceId in(?4) and channelId in(?5) and warningSourceId in(?6) and importanceLevelId in(?7) and provinceId in(?8) and suborigin in(?9) order by eventHappenTime desc") @Query("from XcdDetailInfoView where eventHappenTime between ?1 AND ?2 and providerId in(?3) and dataSourceId in(?4) and channelId in(?5) and warningSourceId in(?6) and importanceLevelId in(?7) and provinceId in(?8) and suborigin in(?9) order by eventHappenTime desc")
// List<XcdDetailInfoView> findAllOrder(Date begintime,Date endtime); // List<XcdDetailInfoView> findAllOrder(Date begintime,Date endtime);
List<XcdDetailInfoView> findAllOrderByTimeAndSuboriginAndAll(Date time1,Date time2,List<Long> provider,List<Long> datasource,List<Long> channel, List<Long> source,List<Long> level,List<Long> province,String suborigin); List<XcdDetailInfoView> findAllOrderByTimeAndSuboriginAndAll(Date time1, Date time2, List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> source, List<Long> level, List<Long> province, String suborigin);
//协查单分析提交条件的集成商钻取/改为事件子来源的钻取(选择了告警来源为‘其他’的筛选) //协查单分析提交条件的集成商钻取/改为事件子来源的钻取(选择了告警来源为‘其他’的筛选)
@Query("from XcdDetailInfoView where providerId in(?1) and dataSourceId in(?2) and channelId in(?3) and provinceId in(?4) and suborigin in(?5) and workingOrderId in(?6) order by eventHappenTime desc") @Query("from XcdDetailInfoView where providerId in(?1) and dataSourceId in(?2) and channelId in(?3) and provinceId in(?4) and suborigin in(?5) and workingOrderId in(?6) order by eventHappenTime desc")
// List<XcdDetailInfoView> findAllOrder(Date begintime,Date endtime); // List<XcdDetailInfoView> findAllOrder(Date begintime,Date endtime);
List<XcdDetailInfoView> findAllOrderByTimeAndSuboriginAndAllOther(List<Long> provider,List<Long> datasource,List<Long> channel,List<Long> province,String suborigin,List<Long> workingorderid); List<XcdDetailInfoView> findAllOrderByTimeAndSuboriginAndAllOther(List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> province, String suborigin, List<Long> workingorderid);
//协查单分析提交条件的省份钻取 //协查单分析提交条件的省份钻取
@Query("from XcdDetailInfoView where eventHappenTime between ?1 AND ?2 and providerId in(?3) and dataSourceId in(?4) and channelId in(?5) and warningSourceId in(?6) and importanceLevelId in(?7) and provinceName in(?8) order by eventHappenTime desc") @Query("from XcdDetailInfoView where eventHappenTime between ?1 AND ?2 and providerId in(?3) and dataSourceId in(?4) and channelId in(?5) and warningSourceId in(?6) and importanceLevelId in(?7) and provinceName in(?8) order by eventHappenTime desc")
// List<XcdDetailInfoView> findAllOrder(Date begintime,Date endtime); // List<XcdDetailInfoView> findAllOrder(Date begintime,Date endtime);
List<XcdDetailInfoView> findAllOrderByTimeAndProvinceAndAll(Date time1,Date time2,List<Long> provider,List<Long> datasource,List<Long> channel, List<Long> source,List<Long> level,String province); List<XcdDetailInfoView> findAllOrderByTimeAndProvinceAndAll(Date time1, Date time2, List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> source, List<Long> level, String province);
//协查单分析提交条件的省份钻取(增加了告警来源为“其他”的筛选项) //协查单分析提交条件的省份钻取(增加了告警来源为“其他”的筛选项)
@Query("from XcdDetailInfoView where providerId in(?1) and dataSourceId in(?2) and channelId in(?3) and provinceName in(?4) and workingOrderId in(?5) order by eventHappenTime desc") @Query("from XcdDetailInfoView where providerId in(?1) and dataSourceId in(?2) and channelId in(?3) and provinceName in(?4) and workingOrderId in(?5) order by eventHappenTime desc")
// List<XcdDetailInfoView> findAllOrder(Date begintime,Date endtime); // List<XcdDetailInfoView> findAllOrder(Date begintime,Date endtime);
List<XcdDetailInfoView> findAllOrderByTimeAndProvinceAndAllOther(List<Long> provider,List<Long> datasource,List<Long> channel,String province,List<Long>workingorderId); List<XcdDetailInfoView> findAllOrderByTimeAndProvinceAndAllOther(List<Long> provider, List<Long> datasource, List<Long> channel, String province, List<Long> workingorderId);
//协查单分析提交条件的集成商钻取/改为事件子来源的钻取 //协查单分析提交条件的集成商钻取/改为事件子来源的钻取
@Query("from XcdDetailInfoView where eventHappenTime between ?1 AND ?2 and providerId in(?3) and dataSourceId in(?4) and channelId in(?5) and provinceId in(?6) and suborigin in(?7)order by eventHappenTime desc") @Query("from XcdDetailInfoView where eventHappenTime between ?1 AND ?2 and providerId in(?3) and dataSourceId in(?4) and channelId in(?5) and provinceId in(?6) and suborigin in(?7)order by eventHappenTime desc")
// List<XcdDetailInfoView> findAllOrder(Date begintime,Date endtime); // List<XcdDetailInfoView> findAllOrder(Date begintime,Date endtime);
List<XcdDetailInfoView> findAllOrderByTimeAndSuboriginAndAllNotRel(Date time1,Date time2,List<Long> provider,List<Long> datasource,List<Long> channel,List<Long> province,String suborigin); List<XcdDetailInfoView> findAllOrderByTimeAndSuboriginAndAllNotRel(Date time1, Date time2, List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> province, String suborigin);
//协查单分析提交条件的省份钻取 //协查单分析提交条件的省份钻取
@Query("from XcdDetailInfoView where eventHappenTime between ?1 AND ?2 and providerId in(?3) and dataSourceId in(?4) and channelId in(?5) and provinceName in(?6) order by eventHappenTime desc") @Query("from XcdDetailInfoView where eventHappenTime between ?1 AND ?2 and providerId in(?3) and dataSourceId in(?4) and channelId in(?5) and provinceName in(?6) order by eventHappenTime desc")
// List<XcdDetailInfoView> findAllOrder(Date begintime,Date endtime); // List<XcdDetailInfoView> findAllOrder(Date begintime,Date endtime);
List<XcdDetailInfoView> findAllOrderByTimeAndProvinceAndAllNotRel(Date time1,Date time2,List<Long> provider,List<Long> datasource,List<Long> channel,String provinceName); List<XcdDetailInfoView> findAllOrderByTimeAndProvinceAndAllNotRel(Date time1, Date time2, List<Long> provider, List<Long> datasource, List<Long> channel, String provinceName);
//折线图的默认页面的钻取 //折线图的默认页面的钻取
@Query("from XcdDetailInfoView where eventHappenTime >= Date(?1) AND eventHappenTime < Date(?1 )+1 order by eventHappenTime desc") @Query("from XcdDetailInfoView where eventHappenTime >= Date(?1) AND eventHappenTime < Date(?1 )+1 order by eventHappenTime desc")
List<XcdDetailInfoView> findPeriodAndOne(Date period); List<XcdDetailInfoView> findPeriodAndOne(Date period);
//折线图提交条件不关联告警的钻取 //折线图提交条件不关联告警的钻取
@Query("from XcdDetailInfoView where eventHappenTime >= Date(?1) AND eventHappenTime < Date(?1 )+1 and providerId in(?2) and dataSourceId in(?3) and channelId in(?4) and provinceId in(?5) order by eventHappenTime desc") @Query("from XcdDetailInfoView where eventHappenTime >= Date(?1) AND eventHappenTime < Date(?1 )+1 and providerId in(?2) and dataSourceId in(?3) and channelId in(?4) and provinceId in(?5) order by eventHappenTime desc")
List<XcdDetailInfoView> findPeriodAndOneNotRel(Date period,List<Long> provider,List<Long> datasource,List<Long> channel,List<Long> province); List<XcdDetailInfoView> findPeriodAndOneNotRel(Date period, List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> province);
//折线图的提交条件的关联告警的钻取 //折线图的提交条件的关联告警的钻取
@Query("from XcdDetailInfoView where eventHappenTime >= Date(?1) AND eventHappenTime < Date(?1 )+1 and providerId in(?2) and dataSourceId in(?3) and channelId in(?4) and warningSourceId in(?5) and importanceLevelId in(?6) and provinceId in(?7) order by eventHappenTime desc") @Query("from XcdDetailInfoView where eventHappenTime >= Date(?1) AND eventHappenTime < Date(?1 )+1 and providerId in(?2) and dataSourceId in(?3) and channelId in(?4) and warningSourceId in(?5) and importanceLevelId in(?6) and provinceId in(?7) order by eventHappenTime desc")
List<XcdDetailInfoView> findPeriodAndOneRel(Date period,List<Long> provider,List<Long> datasource,List<Long> channel, List<Long> source,List<Long> level,List<Long> province); List<XcdDetailInfoView> findPeriodAndOneRel(Date period, List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> source, List<Long> level, List<Long> province);
//折线图的提交条件的关联告警的钻取 //折线图的提交条件的关联告警的钻取
@Query("from XcdDetailInfoView where providerId in(?1) and dataSourceId in(?2) and channelId in(?3) and provinceId in(?4) and workingOrderId in(?5) order by eventHappenTime desc") @Query("from XcdDetailInfoView where providerId in(?1) and dataSourceId in(?2) and channelId in(?3) and provinceId in(?4) and workingOrderId in(?5) order by eventHappenTime desc")
List<XcdDetailInfoView> findPeriodAndOneRelOther(List<Long> provider,List<Long> datasource,List<Long> channel,List<Long> province,List<Long> workingorderid); List<XcdDetailInfoView> findPeriodAndOneRelOther(List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> province, List<Long> workingorderid);
//查找最近一个月未标记为故障的协查单 || Add by August //查找最近一个月未标记为故障的协查单 || Add by August
@Query("from XcdDetailInfoView xcd where xcd.eventHappenTime between timestampadd(M,-1,getdate()) and getdate() and xcd.providerId>=0 and xcd.provinceId>=0 and xcd.channelId>=0 and xcd.dataSourceId>=0 and xcd.relevantFailureId is null order by xcd.eventHappenTime desc") @Query("from XcdDetailInfoView xcd where xcd.eventHappenTime between timestampadd(M,-1,getdate()) and getdate() and xcd.providerId>=0 and xcd.provinceId>=0 and xcd.channelId>=0 and xcd.dataSourceId>=0 and xcd.relevantFailureId is null order by xcd.eventHappenTime desc")
List<XcdDetailInfoView> getByLastMonthEventHappenTime(); List<XcdDetailInfoView> getByLastMonthEventHappenTime();
//告警来源和告警级别同时全选就不再关联告警 || Add by August //告警来源和告警级别同时全选就不再关联告警 || Add by August
List<XcdDetailInfoView> findWorkingOrderIdDistinctByEventHappenTimeBetweenAndProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(Date time1,Date time2,List<Long> provider,List<Long> datasource,List<Long> channel,List<Long> province); List<XcdDetailInfoView> findWorkingOrderIdDistinctByEventHappenTimeBetweenAndProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(Date time1, Date time2, List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> province);
//根绝筛选条件从视图中去查找符合条件的协查单(增加了告警来源为“其他”的筛选项) || Add by August //根绝筛选条件从视图中去查找符合条件的协查单(增加了告警来源为“其他”的筛选项) || Add by August
List<XcdDetailInfoView> findWorkingOrderIdDistinctByProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndWorkingOrderIdInAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(List<Long> provider,List<Long> datasource,List<Long> channel,List<Long> province, List<Long> workingorderids); List<XcdDetailInfoView> findWorkingOrderIdDistinctByProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndWorkingOrderIdInAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> province, List<Long> workingorderids);
//告警来源为null //告警来源为null
List<XcdDetailInfoView> findWorkingOrderIdDistinctByProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndWorkingOrderIdIsNullAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(List<Long> provider,List<Long> datasource,List<Long> channel,List<Long> province); List<XcdDetailInfoView> findWorkingOrderIdDistinctByProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndWorkingOrderIdIsNullAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> province);
//根据协查单编号查找协查单,协查单明细展示 //根据协查单编号查找协查单,协查单明细展示
List <XcdDetailInfoView> findByWorkingOrderCode(String xcdCode);//加List <XcdDetailInfoView>是为了防止数据有问题,例如一个协查单编号对应几条协查单记录,但是在实际环境中一个协查单编号只对应一条记录 List<XcdDetailInfoView> findByWorkingOrderCode(String xcdCode);//加List <XcdDetailInfoView>是为了防止数据有问题,例如一个协查单编号对应几条协查单记录,但是在实际环境中一个协查单编号只对应一条记录
......
...@@ -47,27 +47,27 @@ public class XcdWorkingOrderInfoService { ...@@ -47,27 +47,27 @@ public class XcdWorkingOrderInfoService {
private InsideXcdWorkingOrderInfoDao insideXcdWorkingOrderInfoDao; private InsideXcdWorkingOrderInfoDao insideXcdWorkingOrderInfoDao;
@Autowired//自动加载 @Autowired//自动加载
private XcdWoRelatedModelDao xcdWoRelatedModelDao; private XcdWoRelatedModelDao xcdWoRelatedModelDao;
//根据workingOrderId获取XcdWorkingOrderInfo对象 //根据workingOrderId获取XcdWorkingOrderInfo对象
public XcdWorkingOrderInfo getXcdWorkingOrderInfo(Long workingOrderId){ public XcdWorkingOrderInfo getXcdWorkingOrderInfo(Long workingOrderId) {
return xcdWorkingOrderInfoDao.findOne(workingOrderId); return xcdWorkingOrderInfoDao.findOne(workingOrderId);
} }
//获取所有的XcdWorkingOrderInfo对象并生成分页 //获取所有的XcdWorkingOrderInfo对象并生成分页
public Page<XcdWorkingOrderInfo> getAllXcdWorkingOrderInfo(Map<String, Object> searchParams, int pageNumber, public Page<XcdWorkingOrderInfo> getAllXcdWorkingOrderInfo(Map<String, Object> searchParams, int pageNumber,
int pageSize, String sortType){ int pageSize, String sortType) {
PageRequest pageRequest = buildPageRequest(pageNumber, pageSize, sortType); PageRequest pageRequest = buildPageRequest(pageNumber, pageSize, sortType);
Specification<XcdWorkingOrderInfo> spec = buildSpecification(searchParams); Specification<XcdWorkingOrderInfo> spec = buildSpecification(searchParams);
return xcdWorkingOrderInfoDao.findAll(spec, pageRequest); return xcdWorkingOrderInfoDao.findAll(spec, pageRequest);
} }
//获取所有的XcdWorkingOrderInfo对象存到List中 //获取所有的XcdWorkingOrderInfo对象存到List中
// public List<XcdWorkingOrderInfo> getAllXcd(){ // public List<XcdWorkingOrderInfo> getAllXcd(){
// return (List<XcdWorkingOrderInfo>) xcdWorkingOrderInfoDao.findAll(); // return (List<XcdWorkingOrderInfo>) xcdWorkingOrderInfoDao.findAll();
// } // }
public List<XcdDetailInfoView> getAllXcd(){ public List<XcdDetailInfoView> getAllXcd() {
/*SimpleDateFormat tempDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); /*SimpleDateFormat tempDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date endtime=new Date(); Date endtime=new Date();
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
...@@ -77,7 +77,8 @@ public class XcdWorkingOrderInfoService { ...@@ -77,7 +77,8 @@ public class XcdWorkingOrderInfoService {
// return (List<XcdDetailInfoView>) xcdDetailInfoViewDao.findAllOrder(begintime,endtime); // return (List<XcdDetailInfoView>) xcdDetailInfoViewDao.findAllOrder(begintime,endtime);
return (List<XcdDetailInfoView>) xcdDetailInfoViewDao.findAllOrderByTime(); return (List<XcdDetailInfoView>) xcdDetailInfoViewDao.findAllOrderByTime();
} }
/*
/*
//根据筛选条件获取M满足条件的所有的XcdWorkingOrderInfo对象并生成分页 //根据筛选条件获取M满足条件的所有的XcdWorkingOrderInfo对象并生成分页
public Page<XcdWorkingOrderInfo> getAllXcdWorkingOrderInfoBy(Date time1,Date time2,List channel,List source,List level ,List province,List cloesd){ public Page<XcdWorkingOrderInfo> getAllXcdWorkingOrderInfoBy(Date time1,Date time2,List channel,List source,List level ,List province,List cloesd){
...@@ -85,38 +86,52 @@ public class XcdWorkingOrderInfoService { ...@@ -85,38 +86,52 @@ public class XcdWorkingOrderInfoService {
return (Page<XcdWorkingOrderInfo>) xcdWorkingOrderInfoDao.findByEventHappenTimeBetweenAndChannelIdInAndWarningSourceIdInAndImportanceLevelIdInAndProvinceIdInAndIfClosedIn(time1,time2,channel,source,level ,province,cloesd); return (Page<XcdWorkingOrderInfo>) xcdWorkingOrderInfoDao.findByEventHappenTimeBetweenAndChannelIdInAndWarningSourceIdInAndImportanceLevelIdInAndProvinceIdInAndIfClosedIn(time1,time2,channel,source,level ,province,cloesd);
} }
*/ */
//直接从表中查出数据 //直接从表中查出数据
// public List<XcdWorkingOrderInfo> getAllXcdWorkingOrderInfoBy(Date time1,Date time2,Long[] channel,Long[] source,Long[] level ,Long[] province,String[] cloesd){ // public List<XcdWorkingOrderInfo> getAllXcdWorkingOrderInfoBy(Date time1,Date time2,Long[] channel,Long[] source,Long[] level ,Long[] province,String[] cloesd){
// //
// return (List<XcdWorkingOrderInfo>) xcdWorkingOrderInfoDao.findByEventHappenTimeBetweenAndChannelIdInAndWarningSourceIdInAndImportanceLevelIdInAndProvinceIdInAndIfClosedIn(time1,time2,channel,source,level ,province,cloesd); // return (List<XcdWorkingOrderInfo>) xcdWorkingOrderInfoDao.findByEventHappenTimeBetweenAndChannelIdInAndWarningSourceIdInAndImportanceLevelIdInAndProvinceIdInAndIfClosedIn(time1,time2,channel,source,level ,province,cloesd);
// } // }
//根据筛选条件从视图中查找对应的协查单 //根据筛选条件从视图中查找对应的协查单
public List<XcdDetailInfoView> getAllXcdWorkingOrderInfoBy(Date time1,Date time2,List<Long> provider,List<Long> datasource,List<Long> channel,List<Long> source,List<Long> level ,List<Long> province){ public List<XcdDetailInfoView> getAllXcdWorkingOrderInfoBy(Date time1, Date time2, List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> source, List<Long> level, List<Long> province) {
System.out.println(time1);
System.out.println(time2);
System.out.println(provider);
System.out.println(datasource);
System.out.println(channel);
System.out.println(source);
System.out.println(level);
System.out.println(province);
// return xcdDetailInfoViewDao.findDistinctWorkingOrderIdByEventHappenTimeBetweenAndChannelIdInAndWarningSourceIdInAndIncidenceInAndProvinceIdInOrderByEventHappenTimeDesc(time1,time2,channel,source ,level,province); // return xcdDetailInfoViewDao.findDistinctWorkingOrderIdByEventHappenTimeBetweenAndChannelIdInAndWarningSourceIdInAndIncidenceInAndProvinceIdInOrderByEventHappenTimeDesc(time1,time2,channel,source ,level,province);
return xcdDetailInfoViewDao.findAllOrderByTimeAndAll(time1,time2,provider,datasource,channel,source ,level,province); return xcdDetailInfoViewDao.findAllOrderByTimeAndAll(time1, time2, provider, datasource, channel, source, level, province);
}
public List<XcdDetailInfoView> getAllXcdWorkingOrderInfoBy1(Date time1, Date time2, List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> source, List<Long> level, List<Long> province, char report) {
// return xcdDetailInfoViewDao.findDistinctWorkingOrderIdByEventHappenTimeBetweenAndChannelIdInAndWarningSourceIdInAndIncidenceInAndProvinceIdInOrderByEventHappenTimeDesc(time1,time2,channel,source ,level,province);
//return xcdDetailInfoViewDao.findAllOrderByTimeAndAll(time1, time2, provider, datasource, channel, source, level, province);
return xcdDetailInfoViewDao.findAllOrderByTimeAndAll1(time1, time2, provider, datasource, channel, source, level, province,report);
} }
//根据筛选条件从视图中查找对应的协查单(增加了告警来源为“其他”的筛选项) //根据筛选条件从视图中查找对应的协查单(增加了告警来源为“其他”的筛选项)
public List<XcdDetailInfoView> getAllXcdWorkingOrderInfoByOther(List<Long> provider,List<Long> datasource,List<Long> channel,List<Long> province, List<Long>workingOrderIds){ public List<XcdDetailInfoView> getAllXcdWorkingOrderInfoByOther(List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> province, List<Long> workingOrderIds) {
return xcdDetailInfoViewDao.findWorkingOrderIdDistinctByProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndWorkingOrderIdInOrderByEventHappenTimeDesc(provider,datasource,channel,province,workingOrderIds); return xcdDetailInfoViewDao.findWorkingOrderIdDistinctByProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndWorkingOrderIdInOrderByEventHappenTimeDesc(provider, datasource, channel, province, workingOrderIds);
} }
public List<XcdDetailInfoView> getAllXcdWorkingOrderInfoByOther1(List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> province, List<Long> workingOrderIds, char report) {
return xcdDetailInfoViewDao.findWorkingOrderIdDistinctByProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndWorkingOrderIdInAndReportOrderByEventHappenTimeDesc(provider, datasource, channel, province, workingOrderIds, report);
}
//根据筛选条件从视图中查找对应的协查单,当告警来源和告警级别全选就不再关联告警 //根据筛选条件从视图中查找对应的协查单,当告警来源和告警级别全选就不再关联告警
public List<XcdDetailInfoView> getAllXcdWorkingOrderInfoNotRelBy(Date time1,Date time2,List<Long> provider,List<Long> datasource,List<Long> channel,List<Long> province){ public List<XcdDetailInfoView> getAllXcdWorkingOrderInfoNotRelBy(Date time1, Date time2, List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> province) {
return xcdDetailInfoViewDao.findWorkingOrderIdDistinctByEventHappenTimeBetweenAndProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInOrderByEventHappenTimeDesc(time1,time2,provider,datasource,channel,province); return xcdDetailInfoViewDao.findWorkingOrderIdDistinctByEventHappenTimeBetweenAndProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInOrderByEventHappenTimeDesc(time1, time2, provider, datasource, channel, province);
}
public List<XcdDetailInfoView> getAllXcdWorkingOrderInfoNotRelBy1(Date time1, Date time2, List<Long> provider, List<Long> datasource, List<Long> channel, List<Long> province, char report) {
return xcdDetailInfoViewDao.
findWorkingOrderIdDistinctByEventHappenTimeBetweenAndProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdAndReportInOrderByEventHappenTimeDesc(time1, time2, provider, datasource, channel, province, report);
} }
...@@ -126,7 +141,7 @@ public class XcdWorkingOrderInfoService { ...@@ -126,7 +141,7 @@ public class XcdWorkingOrderInfoService {
}*/ }*/
//根据协查单id去查找对应的XcdDetailInfoView以供告警明细展示的时候根据相关联的协查单id查找到对应的协查单 //根据协查单id去查找对应的XcdDetailInfoView以供告警明细展示的时候根据相关联的协查单id查找到对应的协查单
public List<XcdDetailInfoView> getXcdWorkingOrderInfoById(Long xcdId){ public List<XcdDetailInfoView> getXcdWorkingOrderInfoById(Long xcdId) {
return xcdDetailInfoViewDao.findDistinctWorkingOrderIdByWorkingOrderId(xcdId); return xcdDetailInfoViewDao.findDistinctWorkingOrderIdByWorkingOrderId(xcdId);
} }
...@@ -141,44 +156,43 @@ public class XcdWorkingOrderInfoService { ...@@ -141,44 +156,43 @@ public class XcdWorkingOrderInfoService {
*/ */
//根据筛选条件获取对应的预警或隐患筛选时候加上是否过滤 //根据筛选条件获取对应的预警或隐患筛选时候加上是否过滤
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){ 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); 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){ 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); return xcdWarningInfoViewDao.findByOccurTimeBetweenAndWarningSourceIdInAndRiskEarlyWarningTypeIdInAndDataSourceIdInAndChannelIdInAndBusinessIdInAndProviderIdInAndImportanceLevelIdInAndProvinceIdInAndCloseStatusInAndTypeInOrderByWarningSourceIdAscOccurTimeDescDataSourceIdAscChannelIdAscProvinceIdAscKpiIdAsc(time1, time2, warningsource, risk, dataSource, chnnal, busines, provider, level, province, status, relStatus);
} }
//根据协查单id查找对应的预警或隐患的记录 //根据协查单id查找对应的预警或隐患的记录
public List<XcdWarningInfoView> getXcdWarningInfoViewByWorkingOrderCode(String WorkingOrderId){ public List<XcdWarningInfoView> getXcdWarningInfoViewByWorkingOrderCode(String WorkingOrderId) {
return xcdWarningInfoViewDao.findByWorkingOrderCodeOrderByWarningSourceIdAscOccurTimeDescDataSourceIdAscChannelIdAscProvinceIdAscKpiIdAsc(WorkingOrderId); return xcdWarningInfoViewDao.findByWorkingOrderCodeOrderByWarningSourceIdAscOccurTimeDescDataSourceIdAscChannelIdAscProvinceIdAscKpiIdAsc(WorkingOrderId);
} }
//根据workingOrderId来查找相应的XcdWorkingOrderInfo对象以供更改协查单信息 //根据workingOrderId来查找相应的XcdWorkingOrderInfo对象以供更改协查单信息
public XcdWorkingOrderInfo getWorkingOrderInfoByWorkingOrderId(Long WorkingOrderId){ public XcdWorkingOrderInfo getWorkingOrderInfoByWorkingOrderId(Long WorkingOrderId) {
return xcdWorkingOrderInfoDao.findWorkingOrderInfoByWorkingOrderId(WorkingOrderId); return xcdWorkingOrderInfoDao.findWorkingOrderInfoByWorkingOrderId(WorkingOrderId);
} }
//查找出数据库中现有的协查单最大的id //查找出数据库中现有的协查单最大的id
public Long getMaxWorkingOrderId(){ public Long getMaxWorkingOrderId() {
return xcdWorkingOrderInfoDao.findMaxWorkingOrderId(); return xcdWorkingOrderInfoDao.findMaxWorkingOrderId();
} }
@Transactional(readOnly=false)
public void saveXcdWorkingOrderInfo(XcdWorkingOrderInfo XcdWorkingOrderInfo) @Transactional(readOnly = false)
{ public void saveXcdWorkingOrderInfo(XcdWorkingOrderInfo XcdWorkingOrderInfo) {
xcdWorkingOrderInfoDao.save(XcdWorkingOrderInfo); xcdWorkingOrderInfoDao.save(XcdWorkingOrderInfo);
} }
@Transactional(readOnly=false) @Transactional(readOnly = false)
public void deleteXcdById(Long xcdid) public void deleteXcdById(Long xcdid) {
{
xcdWorkingOrderInfoDao.deleteByWorkingOrderId(xcdid); xcdWorkingOrderInfoDao.deleteByWorkingOrderId(xcdid);
} }
/* /*
...@@ -191,41 +205,43 @@ public class XcdWorkingOrderInfoService { ...@@ -191,41 +205,43 @@ public class XcdWorkingOrderInfoService {
//更新协查单时,在插入模型id和协查单id到XcdWoRelatedModelInfoT表之前,要删掉被选中的模型与协查单的记录,再插入,以防止重复记录的出现 //更新协查单时,在插入模型id和协查单id到XcdWoRelatedModelInfoT表之前,要删掉被选中的模型与协查单的记录,再插入,以防止重复记录的出现
@Transactional(readOnly=false) @Transactional(readOnly = false)
public void deletXcdWoRelatedModelByWidAndMoId(Long workingId,List<Long> modelId){ public void deletXcdWoRelatedModelByWidAndMoId(Long workingId, List<Long> modelId) {
xcdWoRelatedModelDao.deleteByWoIdAndDataMId(workingId,modelId); xcdWoRelatedModelDao.deleteByWoIdAndDataMId(workingId, modelId);
} }
@Transactional(readOnly=false)
public void deletXcdWoRelatedModelByWid(Long workingId){
xcdWoRelatedModelDao.deleteByWoId(workingId);; @Transactional(readOnly = false)
public void deletXcdWoRelatedModelByWid(Long workingId) {
xcdWoRelatedModelDao.deleteByWoId(workingId);
;
} }
//更新相关联的故障ID号 || Add by August //更新相关联的故障ID号 || Add by August
@Transactional(readOnly=false) @Transactional(readOnly = false)
public void updateFailureIdByWorkingOrderIds(Long failureId, List<Long> xcdWorkingIds){ public void updateFailureIdByWorkingOrderIds(Long failureId, List<Long> xcdWorkingIds) {
xcdWorkingOrderInfoDao.updateWorkingOrderInfoByWorkingOrderIds(failureId,xcdWorkingIds); xcdWorkingOrderInfoDao.updateWorkingOrderInfoByWorkingOrderIds(failureId, xcdWorkingIds);
} }
@Transactional(readOnly=false) @Transactional(readOnly = false)
public void updateXcdRelevantFailureIdByFailureId(List<Long> failureIds){ public void updateXcdRelevantFailureIdByFailureId(List<Long> failureIds) {
xcdWorkingOrderInfoDao.updateXcdRelevantFailureIdByFailureId(failureIds); xcdWorkingOrderInfoDao.updateXcdRelevantFailureIdByFailureId(failureIds);
} }
//由最近一个月以及未标记为故障等条件得到协查单 || Add by August //由最近一个月以及未标记为故障等条件得到协查单 || Add by August
public List<XcdDetailInfoView> getXcdByLastMonthAndNotRelevantFailureId(){ public List<XcdDetailInfoView> getXcdByLastMonthAndNotRelevantFailureId() {
return xcdDetailInfoViewDao.getByLastMonthEventHappenTime(); return xcdDetailInfoViewDao.getByLastMonthEventHappenTime();
} }
public void saveInsideXcdInfo(InsideXcdWorkingOrderInfo insideXcdWorkingOrderInfo) {
public void saveInsideXcdInfo(InsideXcdWorkingOrderInfo insideXcdWorkingOrderInfo){
insideXcdWorkingOrderInfoDao.save(insideXcdWorkingOrderInfo); insideXcdWorkingOrderInfoDao.save(insideXcdWorkingOrderInfo);
} }
@Transactional(readOnly=false)
public void updateInsideXcdFileAddressById(String address,Long innerWorkingOrderId){ @Transactional(readOnly = false)
insideXcdWorkingOrderInfoDao.setFileAddressByInnerWorkingOrderId(address,innerWorkingOrderId); public void updateInsideXcdFileAddressById(String address, Long innerWorkingOrderId) {
insideXcdWorkingOrderInfoDao.setFileAddressByInnerWorkingOrderId(address, innerWorkingOrderId);
} }
...@@ -251,9 +267,10 @@ public class XcdWorkingOrderInfoService { ...@@ -251,9 +267,10 @@ public class XcdWorkingOrderInfoService {
}*/ }*/
//根据协查单Id去更新协查单 //根据协查单Id去更新协查单
public void updateWorkingOrderInfoByWorkingOrderId(String workingOrderDescription,String detailReason,Long reasonTypeId,String solution,Long workingOrderId){ public void updateWorkingOrderInfoByWorkingOrderId(String workingOrderDescription, String detailReason, Long reasonTypeId, String solution, Long workingOrderId) {
xcdWorkingOrderInfoDao.updateWorkingOrderInfoByWorkingOrderId(workingOrderDescription,detailReason,reasonTypeId,solution,workingOrderId); xcdWorkingOrderInfoDao.updateWorkingOrderInfoByWorkingOrderId(workingOrderDescription, detailReason, reasonTypeId, solution, workingOrderId);
} }
/** /**
* 创建分页请求. * 创建分页请求.
*/ */
...@@ -271,10 +288,11 @@ public class XcdWorkingOrderInfoService { ...@@ -271,10 +288,11 @@ public class XcdWorkingOrderInfoService {
/** /**
* c创建动态查询条件组合 * c创建动态查询条件组合
*
* @param searchParams * @param searchParams
* @return * @return
*/ */
private Specification<XcdWorkingOrderInfo> buildSpecification(Map<String, Object> searchParams){ private Specification<XcdWorkingOrderInfo> buildSpecification(Map<String, Object> searchParams) {
Map<String, SearchFilter> filters = SearchFilter.parse(searchParams); Map<String, SearchFilter> filters = SearchFilter.parse(searchParams);
Specification<XcdWorkingOrderInfo> spec = DynamicSpecifications.bySearchFilter(filters.values(), XcdWorkingOrderInfo.class); Specification<XcdWorkingOrderInfo> spec = DynamicSpecifications.bySearchFilter(filters.values(), XcdWorkingOrderInfo.class);
return spec; return spec;
......
...@@ -58,6 +58,7 @@ public class PageURLController { ...@@ -58,6 +58,7 @@ public class PageURLController {
//监控运营下的协查单分析 //监控运营下的协查单分析
//WarnAnalysis映射到WEB-INF/views下的MonitorOperation/WorkingOrderAnalysis.jsp页面 //WarnAnalysis映射到WEB-INF/views下的MonitorOperation/WorkingOrderAnalysis.jsp页面
public static String WorkingOrderAnalysis="MonitorOperation/WorkingOrderAnalysis"; public static String WorkingOrderAnalysis="MonitorOperation/WorkingOrderAnalysis";
public static String CustomAnalysis="MonitorOperation/CustomAnalysis";
//监控运营下的故障页面 | author:August //监控运营下的故障页面 | author:August
//监控运营下的故障分析 //监控运营下的故障分析
......
...@@ -70,10 +70,9 @@ import com.hp.cmsz.service.monitoroperation.XcdWarningInfoViewService; ...@@ -70,10 +70,9 @@ import com.hp.cmsz.service.monitoroperation.XcdWarningInfoViewService;
import com.hp.cmsz.repository.XcdDetailInfoViewDao; import com.hp.cmsz.repository.XcdDetailInfoViewDao;
/** /**
*WorkingOrderReasultControll类负责对协查单管理页面进行控制 * WorkingOrderReasultControll类负责对协查单管理页面进行控制
* *
* @author Wang Feng * @author Wang Feng
*
*/ */
@Controller @Controller
@RequestMapping(value = "/MonitorOperation/WorkingOrderReasult") @RequestMapping(value = "/MonitorOperation/WorkingOrderReasult")
...@@ -118,6 +117,7 @@ public class WorkingOrderReasultController { ...@@ -118,6 +117,7 @@ public class WorkingOrderReasultController {
@Autowired @Autowired
private CmszOperationLogService cmszOperationLogService; private CmszOperationLogService cmszOperationLogService;
List<XcdDetailInfoView> staticXcdDetailInfoView; List<XcdDetailInfoView> staticXcdDetailInfoView;
//返回到协查单管理页面(第二个tab(profile)的分页) //返回到协查单管理页面(第二个tab(profile)的分页)
@RequestMapping(method = RequestMethod.GET) @RequestMapping(method = RequestMethod.GET)
public String list(@RequestParam(value = "xcdId", defaultValue = "-1") String xcdcode, public String list(@RequestParam(value = "xcdId", defaultValue = "-1") String xcdcode,
...@@ -130,166 +130,166 @@ public class WorkingOrderReasultController { ...@@ -130,166 +130,166 @@ public class WorkingOrderReasultController {
@RequestParam(value = "ProviderTag", defaultValue = "") String ProviderTag, @RequestParam(value = "ProviderTag", defaultValue = "") String ProviderTag,
@RequestParam(value = "suborigin", defaultValue = "") String suborigin, @RequestParam(value = "suborigin", defaultValue = "") String suborigin,
Map model, ServletRequest request,HttpSession session)throws UnsupportedEncodingException, ParseException{ Map model, ServletRequest request, HttpSession session) throws UnsupportedEncodingException, ParseException {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
System.out.println("xcdcode:"+xcdcode); System.out.println("xcdcode:" + xcdcode);
System.out.println("PeriodTag:"+PeriodTag); System.out.println("PeriodTag:" + PeriodTag);
System.out.println("WarningSourceTag:"+WarningSourceTag); System.out.println("WarningSourceTag:" + WarningSourceTag);
System.out.println("DataSourceTag:"+DataSourceTag); System.out.println("DataSourceTag:" + DataSourceTag);
System.out.println("ChannelTag:"+ChannelTag); System.out.println("ChannelTag:" + ChannelTag);
System.out.println("ImportanceLevelTag:"+ImportanceLevelTag); System.out.println("ImportanceLevelTag:" + ImportanceLevelTag);
System.out.println("ProvinceTag:"+ProvinceTag); System.out.println("ProvinceTag:" + ProvinceTag);
System.out.println("ProviderTag:"+ProviderTag); System.out.println("ProviderTag:" + ProviderTag);
List<XcdDetailInfoView> xcdWorkingOrderInfoS; //存到List中 List<XcdDetailInfoView> xcdWorkingOrderInfoS; //存到List中
if(xcdcode.equals("-1")){ if (xcdcode.equals("-1")) {
xcdWorkingOrderInfoS =xcdWorkingOrderInfoService.getAllXcd(); xcdWorkingOrderInfoS = xcdWorkingOrderInfoService.getAllXcd();
staticXcdDetailInfoView=xcdWorkingOrderInfoS; staticXcdDetailInfoView = xcdWorkingOrderInfoS;
cmszOperationLogService.createLog("查询","协查单明细","协查单明细查询"); cmszOperationLogService.createLog("查询", "协查单明细", "协查单明细查询");
}else if(xcdcode.equals("-2")){ } else if (xcdcode.equals("-2")) {
xcdWorkingOrderInfoS=xcdDetailInfoViewDao.findAllOrderByTimeAndProvince(ProvinceTag); xcdWorkingOrderInfoS = xcdDetailInfoViewDao.findAllOrderByTimeAndProvince(ProvinceTag);
staticXcdDetailInfoView=xcdWorkingOrderInfoS; staticXcdDetailInfoView = xcdWorkingOrderInfoS;
cmszOperationLogService.createLog("查询","协查单明细","协查单统计钻取到协查单明细"); cmszOperationLogService.createLog("查询", "协查单明细", "协查单统计钻取到协查单明细");
}else if(xcdcode.equals("-3")){ } else if (xcdcode.equals("-3")) {
xcdWorkingOrderInfoS=xcdDetailInfoViewDao.findAllOrderByTimeAndSuborigin(suborigin);//这是原来的默认页面的集成商的钻取,现改为事件子来源的钻取 xcdWorkingOrderInfoS = xcdDetailInfoViewDao.findAllOrderByTimeAndSuborigin(suborigin);//这是原来的默认页面的集成商的钻取,现改为事件子来源的钻取
staticXcdDetailInfoView=xcdWorkingOrderInfoS; staticXcdDetailInfoView = xcdWorkingOrderInfoS;
cmszOperationLogService.createLog("查询","协查单明细","协查单统计钻取到协查单明细"); cmszOperationLogService.createLog("查询", "协查单明细", "协查单统计钻取到协查单明细");
}else if(xcdcode.equals("-4")){ } else if (xcdcode.equals("-4")) {
cmszOperationLogService.createLog("查询","协查单明细","协查单统计钻取到协查单明细"); cmszOperationLogService.createLog("查询", "协查单明细", "协查单统计钻取到协查单明细");
String[] time=PeriodTag.split("~"); String[] time = PeriodTag.split("~");
String[] warningSourceS =WarningSourceTag.split("/")[0].split(","); String[] warningSourceS = WarningSourceTag.split("/")[0].split(",");
String[] dataSourceS=DataSourceTag.split("/")[1].split(","); String[] dataSourceS = DataSourceTag.split("/")[1].split(",");
String[] chnnalS=ChannelTag.split("/")[1].split(","); String[] chnnalS = ChannelTag.split("/")[1].split(",");
String[] providerS=ProviderTag.split("/")[1].split(","); String[] providerS = ProviderTag.split("/")[1].split(",");
String[] levelS=ImportanceLevelTag.split("/")[1].split(","); String[] levelS = ImportanceLevelTag.split("/")[1].split(",");
String[] province1=ProvinceTag.split("/"); String[] province1 = ProvinceTag.split("/");
Date time1=sdf.parse(time[0]); Date time1 = sdf.parse(time[0]);
Date time2=sdf.parse(time[1]); Date time2 = sdf.parse(time[1]);
List<Long> warningSourceList=changeStrToList(warningSourceS); List<Long> warningSourceList = changeStrToList(warningSourceS);
List<Long> dataSourceList=changeStrToList(dataSourceS); List<Long> dataSourceList = changeStrToList(dataSourceS);
List<Long> chnnalList=changeStrToList(chnnalS); List<Long> chnnalList = changeStrToList(chnnalS);
List<Long> providerList=changeStrToList(providerS); List<Long> providerList = changeStrToList(providerS);
List<Long> levelList=changeStrToList(levelS); List<Long> levelList = changeStrToList(levelS);
if(WarningSourceTag.split("/")[0].split(",").length>=4){ if (WarningSourceTag.split("/")[0].split(",").length >= 4) {
cmszOperationLogService.createLog("查询","协查单明细","协查单统计钻取到协查单明细"); cmszOperationLogService.createLog("查询", "协查单明细", "协查单统计钻取到协查单明细");
xcdWorkingOrderInfoS=xcdDetailInfoViewDao.findAllOrderByTimeAndProvinceAndAllNotRel(time1,time2,providerList,dataSourceList,chnnalList,province1[1]); xcdWorkingOrderInfoS = xcdDetailInfoViewDao.findAllOrderByTimeAndProvinceAndAllNotRel(time1, time2, providerList, dataSourceList, chnnalList, province1[1]);
staticXcdDetailInfoView=xcdWorkingOrderInfoS; staticXcdDetailInfoView = xcdWorkingOrderInfoS;
}else{ } else {
cmszOperationLogService.createLog("查询","协查单明细","协查单统计钻取到协查单明细"); cmszOperationLogService.createLog("查询", "协查单明细", "协查单统计钻取到协查单明细");
if(WarningSourceTag.equals("4")){ //告警来源增加了“其他” if (WarningSourceTag.equals("4")) { //告警来源增加了“其他”
List<Long> workingorderIds=xcdDetailInfoViewDao.getNotRelWorkingorderId(time1,time2); List<Long> workingorderIds = xcdDetailInfoViewDao.getNotRelWorkingorderId(time1, time2);
xcdWorkingOrderInfoS=xcdDetailInfoViewDao.findAllOrderByTimeAndProvinceAndAllOther(providerList,dataSourceList,chnnalList,province1[1],workingorderIds); xcdWorkingOrderInfoS = xcdDetailInfoViewDao.findAllOrderByTimeAndProvinceAndAllOther(providerList, dataSourceList, chnnalList, province1[1], workingorderIds);
staticXcdDetailInfoView=xcdWorkingOrderInfoS; staticXcdDetailInfoView = xcdWorkingOrderInfoS;
}else{ } else {
xcdWorkingOrderInfoS=xcdDetailInfoViewDao.findAllOrderByTimeAndProvinceAndAll(time1,time2,providerList,dataSourceList,chnnalList,warningSourceList,levelList,province1[1]); xcdWorkingOrderInfoS = xcdDetailInfoViewDao.findAllOrderByTimeAndProvinceAndAll(time1, time2, providerList, dataSourceList, chnnalList, warningSourceList, levelList, province1[1]);
staticXcdDetailInfoView=xcdWorkingOrderInfoS; staticXcdDetailInfoView = xcdWorkingOrderInfoS;
} }
} }
}else if(xcdcode.equals("-5")){ } else if (xcdcode.equals("-5")) {
cmszOperationLogService.createLog("查询","协查单明细","协查单统计钻取到协查单明细"); cmszOperationLogService.createLog("查询", "协查单明细", "协查单统计钻取到协查单明细");
String[] time=PeriodTag.split("~"); String[] time = PeriodTag.split("~");
String[] warningSourceS =WarningSourceTag.split("/")[0].split(","); String[] warningSourceS = WarningSourceTag.split("/")[0].split(",");
String[] dataSourceS=DataSourceTag.split("/")[1].split(","); String[] dataSourceS = DataSourceTag.split("/")[1].split(",");
String[] chnnalS=ChannelTag.split("/")[1].split(","); String[] chnnalS = ChannelTag.split("/")[1].split(",");
String[] levelS=ImportanceLevelTag.split("/")[1].split(","); String[] levelS = ImportanceLevelTag.split("/")[1].split(",");
String[] provinceS=ProvinceTag.split("/")[1].split(","); String[] provinceS = ProvinceTag.split("/")[1].split(",");
String[] providerS=ProviderTag.split("/")[1].split(","); String[] providerS = ProviderTag.split("/")[1].split(",");
String[] suborigin1=suborigin.split("/"); String[] suborigin1 = suborigin.split("/");
Date time1=sdf.parse(time[0]); Date time1 = sdf.parse(time[0]);
Date time2=sdf.parse(time[1]); Date time2 = sdf.parse(time[1]);
List<Long> warningSourceList=changeStrToList(warningSourceS); List<Long> warningSourceList = changeStrToList(warningSourceS);
List<Long> dataSourceList=changeStrToList(dataSourceS); List<Long> dataSourceList = changeStrToList(dataSourceS);
List<Long> chnnalList=changeStrToList(chnnalS); List<Long> chnnalList = changeStrToList(chnnalS);
List<Long> levelList=changeStrToList(levelS); List<Long> levelList = changeStrToList(levelS);
List<Long> provinceList=changeStrToList(provinceS); List<Long> provinceList = changeStrToList(provinceS);
List<Long> providerList=changeStrToList(providerS); List<Long> providerList = changeStrToList(providerS);
if(WarningSourceTag.split("/")[0].split(",").length>=4){ if (WarningSourceTag.split("/")[0].split(",").length >= 4) {
xcdWorkingOrderInfoS=xcdDetailInfoViewDao.findAllOrderByTimeAndSuboriginAndAllNotRel(time1,time2,providerList,dataSourceList,chnnalList,provinceList,suborigin1[1]); xcdWorkingOrderInfoS = xcdDetailInfoViewDao.findAllOrderByTimeAndSuboriginAndAllNotRel(time1, time2, providerList, dataSourceList, chnnalList, provinceList, suborigin1[1]);
staticXcdDetailInfoView=xcdWorkingOrderInfoS; staticXcdDetailInfoView = xcdWorkingOrderInfoS;
}else{ } else {
if(WarningSourceTag.equals("4")){ //告警来源增加了“其他” if (WarningSourceTag.equals("4")) { //告警来源增加了“其他”
List<Long> workingorderIds=xcdDetailInfoViewDao.getNotRelWorkingorderId(time1,time2); List<Long> workingorderIds = xcdDetailInfoViewDao.getNotRelWorkingorderId(time1, time2);
xcdWorkingOrderInfoS=xcdDetailInfoViewDao.findAllOrderByTimeAndSuboriginAndAllOther(providerList,dataSourceList,chnnalList,provinceList,suborigin1[1],workingorderIds); xcdWorkingOrderInfoS = xcdDetailInfoViewDao.findAllOrderByTimeAndSuboriginAndAllOther(providerList, dataSourceList, chnnalList, provinceList, suborigin1[1], workingorderIds);
staticXcdDetailInfoView=xcdWorkingOrderInfoS; staticXcdDetailInfoView = xcdWorkingOrderInfoS;
}else{ } else {
xcdWorkingOrderInfoS=xcdDetailInfoViewDao.findAllOrderByTimeAndSuboriginAndAll(time1,time2,providerList,dataSourceList,chnnalList,warningSourceList,levelList,provinceList,suborigin1[1]); xcdWorkingOrderInfoS = xcdDetailInfoViewDao.findAllOrderByTimeAndSuboriginAndAll(time1, time2, providerList, dataSourceList, chnnalList, warningSourceList, levelList, provinceList, suborigin1[1]);
staticXcdDetailInfoView=xcdWorkingOrderInfoS; staticXcdDetailInfoView = xcdWorkingOrderInfoS;
} }
} }
}else if(xcdcode.equals("-6")){ } else if (xcdcode.equals("-6")) {
cmszOperationLogService.createLog("查询","协查单明细","协查单统计钻取到协查单明细"); cmszOperationLogService.createLog("查询", "协查单明细", "协查单统计钻取到协查单明细");
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd");
Date period=sdf2.parse(PeriodTag.trim()); Date period = sdf2.parse(PeriodTag.trim());
xcdWorkingOrderInfoS=xcdDetailInfoViewDao.findPeriodAndOne(period); xcdWorkingOrderInfoS = xcdDetailInfoViewDao.findPeriodAndOne(period);
staticXcdDetailInfoView=xcdWorkingOrderInfoS; staticXcdDetailInfoView = xcdWorkingOrderInfoS;
}else if(xcdcode.equals("-7")){ } else if (xcdcode.equals("-7")) {
cmszOperationLogService.createLog("查询","协查单明细","协查单统计钻取到协查单明细"); cmszOperationLogService.createLog("查询", "协查单明细", "协查单统计钻取到协查单明细");
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd");
Date period=sdf2.parse(PeriodTag.trim()); Date period = sdf2.parse(PeriodTag.trim());
String[] warningSourceS =WarningSourceTag.split("/")[0].split(","); String[] warningSourceS = WarningSourceTag.split("/")[0].split(",");
String[] dataSourceS=DataSourceTag.split("/")[1].split(","); String[] dataSourceS = DataSourceTag.split("/")[1].split(",");
String[] chnnalS=ChannelTag.split("/")[1].split(","); String[] chnnalS = ChannelTag.split("/")[1].split(",");
String[] levelS=ImportanceLevelTag.split("/")[1].split(","); String[] levelS = ImportanceLevelTag.split("/")[1].split(",");
String[] provinceS=ProvinceTag.split("/")[1].split(","); String[] provinceS = ProvinceTag.split("/")[1].split(",");
String[] providerS=ProviderTag.split("/")[1].split(","); String[] providerS = ProviderTag.split("/")[1].split(",");
List<Long> warningSourceList=changeStrToList(warningSourceS); List<Long> warningSourceList = changeStrToList(warningSourceS);
List<Long> dataSourceList=changeStrToList(dataSourceS); List<Long> dataSourceList = changeStrToList(dataSourceS);
List<Long> chnnalList=changeStrToList(chnnalS); List<Long> chnnalList = changeStrToList(chnnalS);
List<Long> levelList=changeStrToList(levelS); List<Long> levelList = changeStrToList(levelS);
List<Long> provinceList=changeStrToList(provinceS); List<Long> provinceList = changeStrToList(provinceS);
List<Long> providerList=changeStrToList(providerS); List<Long> providerList = changeStrToList(providerS);
if(WarningSourceTag.split("/")[0].split(",").length>=4){ if (WarningSourceTag.split("/")[0].split(",").length >= 4) {
xcdWorkingOrderInfoS=xcdDetailInfoViewDao.findPeriodAndOneNotRel(period,providerList,dataSourceList,chnnalList,provinceList); xcdWorkingOrderInfoS = xcdDetailInfoViewDao.findPeriodAndOneNotRel(period, providerList, dataSourceList, chnnalList, provinceList);
}else{ } else {
if(WarningSourceTag.equals("4")){ //告警来源增加了“其他” if (WarningSourceTag.equals("4")) { //告警来源增加了“其他”
List<Long> workingorderIds=xcdDetailInfoViewDao.getNotRelWorkingorderIdTime(period); List<Long> workingorderIds = xcdDetailInfoViewDao.getNotRelWorkingorderIdTime(period);
xcdWorkingOrderInfoS=xcdDetailInfoViewDao.findPeriodAndOneRelOther(providerList,dataSourceList,chnnalList,provinceList,workingorderIds); xcdWorkingOrderInfoS = xcdDetailInfoViewDao.findPeriodAndOneRelOther(providerList, dataSourceList, chnnalList, provinceList, workingorderIds);
staticXcdDetailInfoView=xcdWorkingOrderInfoS; staticXcdDetailInfoView = xcdWorkingOrderInfoS;
}else{ } else {
xcdWorkingOrderInfoS=xcdDetailInfoViewDao.findPeriodAndOneRel(period,providerList,dataSourceList,chnnalList,warningSourceList,levelList,provinceList); xcdWorkingOrderInfoS = xcdDetailInfoViewDao.findPeriodAndOneRel(period, providerList, dataSourceList, chnnalList, warningSourceList, levelList, provinceList);
staticXcdDetailInfoView=xcdWorkingOrderInfoS; staticXcdDetailInfoView = xcdWorkingOrderInfoS;
} }
} }
}else if(xcdcode.equals("-8")){ } else if (xcdcode.equals("-8")) {
xcdWorkingOrderInfoS=xcdDetailInfoViewDao.findAllUncloseIfSystemOrderByTime(); xcdWorkingOrderInfoS = xcdDetailInfoViewDao.findAllUncloseIfSystemOrderByTime();
staticXcdDetailInfoView=xcdWorkingOrderInfoS; staticXcdDetailInfoView = xcdWorkingOrderInfoS;
}else{ } else {
xcdWorkingOrderInfoS=xcdDetailInfoViewDao.findByWorkingOrderCode(xcdcode.trim()); xcdWorkingOrderInfoS = xcdDetailInfoViewDao.findByWorkingOrderCode(xcdcode.trim());
staticXcdDetailInfoView=xcdWorkingOrderInfoS; staticXcdDetailInfoView = xcdWorkingOrderInfoS;
cmszOperationLogService.createLog("查询","协查单明细","xcd_working_order_info_t.WORKING_ORDER_CODE="+xcdcode.trim()); cmszOperationLogService.createLog("查询", "协查单明细", "xcd_working_order_info_t.WORKING_ORDER_CODE=" + xcdcode.trim());
} }
if(model.containsKey("xcdWorkingOrderInfoS")){ if (model.containsKey("xcdWorkingOrderInfoS")) {
model.remove("xcdWorkingOrderInfoS"); model.remove("xcdWorkingOrderInfoS");
} }
//将其查询的结果集List,转换成JSON格式传递给前台 //将其查询的结果集List,转换成JSON格式传递给前台
Gson gson=new Gson(); Gson gson = new Gson();
model.put("xcdWorkingOrderInfoJson", gson.toJson(xcdWorkingOrderInfoS)); model.put("xcdWorkingOrderInfoJson", gson.toJson(xcdWorkingOrderInfoS));
//创建searchParams对象用来完成过滤操作 //创建searchParams对象用来完成过滤操作
Map<String, Object> searchParams0 = new HashMap<String, Object>(); Map<String, Object> searchParams0 = new HashMap<String, Object>();
//查询出所有的告警来源 //查询出所有的告警来源
List<WarningSource> warningSourceList=warningSourceService.getAllWarningSource(); List<WarningSource> warningSourceList = warningSourceService.getAllWarningSource();
//查询出所有的渠道信息 //查询出所有的渠道信息
List<Channel> channelList=(List<Channel>)channelService.getAllChannels(); List<Channel> channelList = (List<Channel>) channelService.getAllChannels();
//查询出所有的数据来源信息 //查询出所有的数据来源信息
List<DataSource> datasourceList=(List<DataSource>)dataSourceService.getAllDataSources(); List<DataSource> datasourceList = (List<DataSource>) dataSourceService.getAllDataSources();
/* //查询出所有的业务 /* //查询出所有的业务
List<String> businessList=businessService.getAllBusinessIdAndBusinessName();*/ List<String> businessList=businessService.getAllBusinessIdAndBusinessName();*/
//查询出所有的省份 //查询出所有的省份
List<Province> provinceList=(List<Province>)provinceDao.findProvince(); List<Province> provinceList = (List<Province>) provinceDao.findProvince();
//查询出所有的集成商 //查询出所有的集成商
List<Provider> providerList=(List<Provider>)providerDao.findProvidersByProvinceVersionConfig(); List<Provider> providerList = (List<Provider>) providerDao.findProvidersByProvinceVersionConfig();
model.put("warningSourceList", warningSourceList); model.put("warningSourceList", warningSourceList);
model.put("channelList", channelList); model.put("channelList", channelList);
model.put("datasourceList", datasourceList); model.put("datasourceList", datasourceList);
...@@ -373,143 +373,117 @@ public class WorkingOrderReasultController { ...@@ -373,143 +373,117 @@ public class WorkingOrderReasultController {
@RequestParam(value = "provider") String provider, @RequestParam(value = "provider") String provider,
// @RequestParam(value = "ifClosed2") String ifClosed, // @RequestParam(value = "ifClosed2") String ifClosed,
@RequestParam(value = "xcdcode") String xcdcode, @RequestParam(value = "xcdcode") String xcdcode,
@RequestParam(value = "report") String reports,
HttpServletResponse response) throws ParseException, UnsupportedEncodingException { HttpServletResponse response) throws ParseException, UnsupportedEncodingException {
System.out.println("warningSource"+warningSource); System.out.println("warningSource" + warningSource);
List<XcdDetailInfoView> xcdWorkingOrderInfoS; //存到List中 List<XcdDetailInfoView> xcdWorkingOrderInfoS; //存到List中
//操作日志记录 //操作日志记录
cmszOperationLogService.createLog("查询","协查单明细","协查单明细查询"); cmszOperationLogService.createLog("查询", "协查单明细", "协查单明细查询");
importantLevel=java.net.URLDecoder.decode(importantLevel,"UTF-8");//一次编码 importantLevel = java.net.URLDecoder.decode(importantLevel, "UTF-8");//一次编码
if(xcdcode.equals("-1")){ if (xcdcode.equals("-1")) {
xcdWorkingOrderInfoS =xcdWorkingOrderInfoService.getAllXcd(); xcdWorkingOrderInfoS = xcdWorkingOrderInfoService.getAllXcd();
staticXcdDetailInfoView=xcdWorkingOrderInfoS; staticXcdDetailInfoView = xcdWorkingOrderInfoS;
} } else if (xcdcode.equals("0")) {
else if(xcdcode.equals("0")){
//将String型的time转换成两个为Date的时间 //将String型的time转换成两个为Date的时间
String[] times=time.split("~|~"); String[] times = time.split("~|~");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date time1=sdf.parse(times[0]); Date time1 = sdf.parse(times[0]);
Date time2=sdf.parse(times[1]); Date time2 = sdf.parse(times[1]);
//将String型转换成List //将String型转换成List
String[] channels=channel.split(","); String[] channels = channel.split(",");
// List list1=new ArrayList();
int size1=channels.length; int size1 = channels.length;
List<Long> channelS = new ArrayList<Long>(); List<Long> channelS = new ArrayList<Long>();
for(int i=0;i<channels.length;i++){ for (int i = 0; i < channels.length; i++) {
channelS.add(Long.parseLong(channels[i])); channelS.add(Long.parseLong(channels[i]));
} }
// Long[] channelS=new Long[size1];
// for(int i=0;i<channels.length;i++) String[] warningSources = warningSource.split(",");
// { int size2 = warningSources.length;
//// list1.add(channels[i]);
// channelS[i]=Long.parseLong(channels[i]);
// }
String[] warningSources=warningSource.split(",");
int size2=warningSources.length;
List<Long> warningSourceS = new ArrayList<Long>(); List<Long> warningSourceS = new ArrayList<Long>();
for(int i=0;i<warningSources.length;i++){ for (int i = 0; i < warningSources.length; i++) {
warningSourceS.add(Long.parseLong(warningSources[i])); warningSourceS.add(Long.parseLong(warningSources[i]));
} }
// System.out.println("string[]"+ Arrays.toString(warningSources)); String[] importantLevels = importantLevel.split(",");
//// List list2=new ArrayList(); int size3 = importantLevels.length;
// int size2=warningSources.length;
// System.out.println("size2"+size2);
// Long[] warningSourceS=new Long[size2];
// for(int i=0;i<warningSources.length;i++)
// {
//// list2.add(warningSources[i]);
// warningSourceS[i]=Long.parseLong(warningSources[i]);
// }
// System.out.println("Long[]"+Arrays.toString(warningSourceS));
String[] importantLevels=importantLevel.split(",");
int size3=importantLevels.length;
List<Long> importantLevelS = new ArrayList<Long>(); List<Long> importantLevelS = new ArrayList<Long>();
for(int i=0;i<importantLevels.length;i++){ for (int i = 0; i < importantLevels.length; i++) {
importantLevelS.add(Long.parseLong(importantLevels[i])); importantLevelS.add(Long.parseLong(importantLevels[i]));
} }
// Long[] importantLevelS=new Long[size3];
// for(int i=0;i<importantLevels.length;i++)
// {
//// list1.add(channels[i]);
// importantLevelS[i]=Long.parseLong(importantLevels[i]);
// }
String[] provinces=province.split(","); String[] provinces = province.split(",");
int size4=provinces.length; int size4 = provinces.length;
List<Long> provinceS = new ArrayList<Long>(); List<Long> provinceS = new ArrayList<Long>();
for(int i=0;i<provinces.length;i++){ for (int i = 0; i < provinces.length; i++) {
provinceS.add(Long.parseLong(provinces[i])); provinceS.add(Long.parseLong(provinces[i]));
} }
// Long[] provinceS=new Long[size4]; String[] datasourceid = datasource.split(",");
// for(int i=0;i<provinces.length;i++) int size5 = datasourceid.length;
// {
// provinceS[i]=Long.parseLong(provinces[i]);
// }
String[] datasourceid=datasource.split(",");
int size5=datasourceid.length;
List<Long> datasourceS = new ArrayList<Long>(); List<Long> datasourceS = new ArrayList<Long>();
for(int i=0;i<datasourceid.length;i++){ for (int i = 0; i < datasourceid.length; i++) {
datasourceS.add(Long.parseLong(datasourceid[i])); datasourceS.add(Long.parseLong(datasourceid[i]));
} }
// Long[] datasourceS=new Long[size5];
// for(int i=0;i<datasourceid.length;i++) String[] providerid = provider.split(",");
// { int size6 = providerid.length;
// datasourceS[i]=Long.parseLong(datasourceid[i]);
// }
String[] providerid=provider.split(",");
int size6=providerid.length;
List<Long> providerS = new ArrayList<Long>(); List<Long> providerS = new ArrayList<Long>();
for(int i=0;i<providerid.length;i++){ for (int i = 0; i < providerid.length; i++) {
providerS.add(Long.parseLong(providerid[i])); providerS.add(Long.parseLong(providerid[i]));
} }
// Long[] providerS=new Long[size6]; char report = reports.equals("-") ? (char) -1 : reports.charAt(0);
// for(int i=0;i<providerid.length;i++) System.out.println("reports =" + reports);
// { if (size2 >= 4) {
// providerS[i]=Long.parseLong(providerid[i]); if (report == -1) {
// } xcdWorkingOrderInfoS = xcdWorkingOrderInfoService.getAllXcdWorkingOrderInfoNotRelBy(time1, time2, providerS, datasourceS, channelS, provinceS);
if(size2>=4){
xcdWorkingOrderInfoS =xcdWorkingOrderInfoService.getAllXcdWorkingOrderInfoNotRelBy(time1,time2,providerS,datasourceS,channelS,provinceS);
staticXcdDetailInfoView=xcdWorkingOrderInfoS;
}else{ }else{
if(warningSource.equals("4")){ xcdWorkingOrderInfoS = xcdWorkingOrderInfoService.getAllXcdWorkingOrderInfoNotRelBy1(time1, time2, providerS, datasourceS, channelS, provinceS, report);
List<BigInteger> workingorderIds=xcdDetailInfoViewDao.getNotRelBigWorkingorderId(time1,time2); }
List<Long> worIds=new ArrayList<Long>(); staticXcdDetailInfoView = xcdWorkingOrderInfoS;
for(int i=0;i<workingorderIds.size();i++){ } else {
BigInteger ids=workingorderIds.get(i); if (warningSource.equals("4")) {
List<BigInteger> workingorderIds = xcdDetailInfoViewDao.getNotRelBigWorkingorderId(time1, time2);
List<Long> worIds = new ArrayList<Long>();
for (int i = 0; i < workingorderIds.size(); i++) {
BigInteger ids = workingorderIds.get(i);
worIds.add(ids.longValue()); worIds.add(ids.longValue());
} }
xcdWorkingOrderInfoS =xcdWorkingOrderInfoService.getAllXcdWorkingOrderInfoByOther(providerS,datasourceS,channelS,provinceS,worIds); if (report == -1) {
xcdWorkingOrderInfoS = xcdWorkingOrderInfoService.getAllXcdWorkingOrderInfoNotRelBy(time1, time2, providerS, datasourceS, channelS, provinceS);
}else{
xcdWorkingOrderInfoS = xcdWorkingOrderInfoService.getAllXcdWorkingOrderInfoNotRelBy1(time1, time2, providerS, datasourceS, channelS, provinceS, report);
}
} else {
if (report == -1) {
xcdWorkingOrderInfoS = xcdWorkingOrderInfoService.getAllXcdWorkingOrderInfoNotRelBy(time1, time2, providerS, datasourceS, channelS, provinceS);
}else{ }else{
xcdWorkingOrderInfoS =xcdWorkingOrderInfoService.getAllXcdWorkingOrderInfoBy(time1,time2,providerS,datasourceS,channelS,warningSourceS,importantLevelS ,provinceS); xcdWorkingOrderInfoS = xcdWorkingOrderInfoService.getAllXcdWorkingOrderInfoNotRelBy1(time1, time2, providerS, datasourceS, channelS, provinceS, report);
}
} }
staticXcdDetailInfoView=xcdWorkingOrderInfoS; staticXcdDetailInfoView = xcdWorkingOrderInfoS;
} }
// List<Long>id=xcdDetailInfoViewDao.findIdByCondition(time1,time2,importantLevels,provinceS,channelS, warningSourceS); // List<Long>id=xcdDetailInfoViewDao.findIdByCondition(time1,time2,importantLevels,provinceS,channelS, warningSourceS);
// xcdWorkingOrderInfoS=xcdDetailInfoViewDao.findByWorkingOrderId(id); // xcdWorkingOrderInfoS=xcdDetailInfoViewDao.findByWorkingOrderId(id);
// xcdWorkingOrderInfoS =xcdWorkingOrderInfoService.getAllXcdByConditions(time1,time2,channel,warningSource,importantLevel,province,ifClosed); // xcdWorkingOrderInfoS =xcdWorkingOrderInfoService.getAllXcdByConditions(time1,time2,channel,warningSource,importantLevel,province,ifClosed);
}else{ } else {
xcdWorkingOrderInfoS =xcdDetailInfoViewDao.findByWorkingOrderCode(xcdcode.trim()); xcdWorkingOrderInfoS = xcdDetailInfoViewDao.findByWorkingOrderCode(xcdcode.trim());
staticXcdDetailInfoView=xcdWorkingOrderInfoS; staticXcdDetailInfoView = xcdWorkingOrderInfoS;
} }
Gson gson = new Gson(); Gson gson = new Gson();
response.setContentType("text/Xml;charset=gbk"); response.setContentType("text/Xml;charset=gbk");
PrintWriter out = null; PrintWriter out = null;
// System.out.println(gson.toJson(xcdWorkingOrderInfoS));
try { try {
out = response.getWriter(); out = response.getWriter();
out.println(gson.toJson(xcdWorkingOrderInfoS)); out.println(gson.toJson(xcdWorkingOrderInfoS));
} } catch (IOException ex1) {
catch (IOException ex1) {
ex1.printStackTrace(); ex1.printStackTrace();
}finally{ } finally {
out.close(); out.close();
} }
} }
//根据查询条件,改变分页中的内容 || Add by August //根据查询条件,改变分页中的内容 || Add by August
...@@ -532,57 +506,57 @@ public class WorkingOrderReasultController { ...@@ -532,57 +506,57 @@ public class WorkingOrderReasultController {
Date endTime = sdf.parse(times[1]); Date endTime = sdf.parse(times[1]);
String[] dataSources = xcdDataSource.split(","); String[] dataSources = xcdDataSource.split(",");
List<Long> dataSourceList = new ArrayList<Long>(); List<Long> dataSourceList = new ArrayList<Long>();
for(int i=0;i<dataSources.length;i++){ for (int i = 0; i < dataSources.length; i++) {
dataSourceList.add(Long.parseLong(dataSources[i])); dataSourceList.add(Long.parseLong(dataSources[i]));
} }
String[] channels = xcdChannel.split(","); String[] channels = xcdChannel.split(",");
List<Long> channelList = new ArrayList<Long>(); List<Long> channelList = new ArrayList<Long>();
for(int i=0;i<channels.length;i++){ for (int i = 0; i < channels.length; i++) {
channelList.add(Long.parseLong(channels[i])); channelList.add(Long.parseLong(channels[i]));
} }
String[] xcdWarnings = xcdWarning.split(","); String[] xcdWarnings = xcdWarning.split(",");
List<Long> warningList = new ArrayList<Long>(); List<Long> warningList = new ArrayList<Long>();
for(int i=0;i<xcdWarnings.length;i++){ for (int i = 0; i < xcdWarnings.length; i++) {
warningList.add(Long.parseLong(xcdWarnings[i])); warningList.add(Long.parseLong(xcdWarnings[i]));
} }
String[] xcdImpLevels = xcdImpLevel.split(","); String[] xcdImpLevels = xcdImpLevel.split(",");
List<Long> impLevelList = new ArrayList<Long>(); List<Long> impLevelList = new ArrayList<Long>();
for(int i=0;i<xcdImpLevels.length;i++){ for (int i = 0; i < xcdImpLevels.length; i++) {
impLevelList.add(Long.parseLong(xcdImpLevels[i])); impLevelList.add(Long.parseLong(xcdImpLevels[i]));
} }
String[] provinces = xcdProvince.split(","); String[] provinces = xcdProvince.split(",");
List<Long> provincesList = new ArrayList<Long>(); List<Long> provincesList = new ArrayList<Long>();
for(int i=0;i<provinces.length;i++){ for (int i = 0; i < provinces.length; i++) {
provincesList.add(Long.parseLong(provinces[i])); provincesList.add(Long.parseLong(provinces[i]));
} }
String[] providers = xcdProvider.split(","); String[] providers = xcdProvider.split(",");
List<Long> providerList = new ArrayList<Long>(); List<Long> providerList = new ArrayList<Long>();
for(int i=0;i<providers.length;i++){ for (int i = 0; i < providers.length; i++) {
providerList.add(Long.parseLong(providers[i])); providerList.add(Long.parseLong(providers[i]));
} }
List<XcdDetailInfoView> xcdWorkingOrderInfos = new ArrayList<XcdDetailInfoView>(); List<XcdDetailInfoView> xcdWorkingOrderInfos = new ArrayList<XcdDetailInfoView>();
if(xcdWarnings.length>=4){ if (xcdWarnings.length >= 4) {
xcdWorkingOrderInfos =xcdDetailInfoViewDao.findWorkingOrderIdDistinctByEventHappenTimeBetweenAndProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(startTime,endTime,providerList,dataSourceList,channelList,provincesList); xcdWorkingOrderInfos = xcdDetailInfoViewDao.findWorkingOrderIdDistinctByEventHappenTimeBetweenAndProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(startTime, endTime, providerList, dataSourceList, channelList, provincesList);
}else{ } else {
if(xcdWarning.equals("4")){ if (xcdWarning.equals("4")) {
List<BigInteger> workingorderIds=xcdDetailInfoViewDao.getNotRelBigWorkingorderId(startTime,endTime); List<BigInteger> workingorderIds = xcdDetailInfoViewDao.getNotRelBigWorkingorderId(startTime, endTime);
List<Long> worIds=new ArrayList<Long>(); List<Long> worIds = new ArrayList<Long>();
if(!workingorderIds.isEmpty()){ if (!workingorderIds.isEmpty()) {
for(int i=0;i<workingorderIds.size();i++){ for (int i = 0; i < workingorderIds.size(); i++) {
BigInteger ids=workingorderIds.get(i); BigInteger ids = workingorderIds.get(i);
worIds.add(ids.longValue()); worIds.add(ids.longValue());
} }
} }
if(!worIds.isEmpty()){ if (!worIds.isEmpty()) {
xcdWorkingOrderInfos =xcdDetailInfoViewDao.findWorkingOrderIdDistinctByProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndWorkingOrderIdInAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(providerList,dataSourceList,channelList,provincesList,worIds); xcdWorkingOrderInfos = xcdDetailInfoViewDao.findWorkingOrderIdDistinctByProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndWorkingOrderIdInAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(providerList, dataSourceList, channelList, provincesList, worIds);
}else{ } else {
xcdWorkingOrderInfos =xcdDetailInfoViewDao.findWorkingOrderIdDistinctByProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndWorkingOrderIdIsNullAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(providerList,dataSourceList,channelList,provincesList); xcdWorkingOrderInfos = xcdDetailInfoViewDao.findWorkingOrderIdDistinctByProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndWorkingOrderIdIsNullAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(providerList, dataSourceList, channelList, provincesList);
} }
}else{ } else {
xcdWorkingOrderInfos = xcdDetailInfoViewDao.findWorkingOrderIdDistinctByEventHappenTimeBetweenAndProviderIdInAndDataSourceIdInAndChannelIdInAndWarningSourceIdInAndImportanceLevelIdInAndProvinceIdInAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(startTime, endTime, providerList, dataSourceList, channelList, warningList, impLevelList, provincesList); xcdWorkingOrderInfos = xcdDetailInfoViewDao.findWorkingOrderIdDistinctByEventHappenTimeBetweenAndProviderIdInAndDataSourceIdInAndChannelIdInAndWarningSourceIdInAndImportanceLevelIdInAndProvinceIdInAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(startTime, endTime, providerList, dataSourceList, channelList, warningList, impLevelList, provincesList);
} }
} }
...@@ -595,10 +569,9 @@ public class WorkingOrderReasultController { ...@@ -595,10 +569,9 @@ public class WorkingOrderReasultController {
try { try {
out = response.getWriter(); out = response.getWriter();
out.println(gson.toJson(xcdWorkingOrderInfos)); out.println(gson.toJson(xcdWorkingOrderInfos));
} } catch (IOException ex1) {
catch (IOException ex1) {
ex1.printStackTrace(); ex1.printStackTrace();
}finally{ } finally {
out.close(); out.close();
} }
} }
...@@ -615,12 +588,13 @@ public class WorkingOrderReasultController { ...@@ -615,12 +588,13 @@ public class WorkingOrderReasultController {
@RequestParam(value = "province2") String province, @RequestParam(value = "province2") String province,
// @RequestParam(value = "ifClosed2") String ifClosed, // @RequestParam(value = "ifClosed2") String ifClosed,
@RequestParam(value = "xcdcode") String xcdcode, @RequestParam(value = "xcdcode") String xcdcode,
HttpServletRequest request,HttpServletResponse response,HttpSession session,ModelMap model) throws Exception { @RequestParam(value = "report") String reports,
cmszOperationLogService.createLog("导出","协查单明细","导出协查单明细信息"); HttpServletRequest request, HttpServletResponse response, HttpSession session, ModelMap model) throws Exception {
cmszOperationLogService.createLog("导出", "协查单明细", "导出协查单明细信息");
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式 SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
//importantLevel=java.net.URLDecoder.decode(importantLevel,"UTF-8");//一次编码 //importantLevel=java.net.URLDecoder.decode(importantLevel,"UTF-8");//一次编码
String fileName = "协查单详细列表_"+df.format(new Date());// new Date()为获取当前系统时间 String fileName = "协查单详细列表_" + df.format(new Date());// new Date()为获取当前系统时间
try { try {
fileName = new String(fileName.getBytes("gb2312"), "ISO-8859-1"); fileName = new String(fileName.getBytes("gb2312"), "ISO-8859-1");
} catch (UnsupportedEncodingException e1) { } catch (UnsupportedEncodingException e1) {
...@@ -655,6 +629,7 @@ public class WorkingOrderReasultController { ...@@ -655,6 +629,7 @@ public class WorkingOrderReasultController {
fialList.add("解决方案"); fialList.add("解决方案");
fialList.add("故障明细原因"); fialList.add("故障明细原因");
fialList.add("影响范围"); fialList.add("影响范围");
fialList.add("分析报告");
// 该报表的列数 // 该报表的列数
int number = fialList.size(); int number = fialList.size();
...@@ -783,42 +758,62 @@ public class WorkingOrderReasultController { ...@@ -783,42 +758,62 @@ public class WorkingOrderReasultController {
list=xcdDetailInfoViewDao.findByWorkingOrderCode(xcdcode.trim()); list=xcdDetailInfoViewDao.findByWorkingOrderCode(xcdcode.trim());
} }
*/ */
list=staticXcdDetailInfoView; list = staticXcdDetailInfoView;
int rowNum=list.size(); int rowNum = list.size();
// 设置列表数据 // 设置列表数据
for (int i = 2; i < (rowNum+2); i++) { for (int i = 2; i < (rowNum + 2); i++) {
HSSFRow row = sheet.createRow(i); HSSFRow row = sheet.createRow(i);
// 设置行高 // 设置行高
row.setHeight((short) 350); row.setHeight((short) 350);
//报表数据 //报表数据
XcdDetailInfoView xcdWorkingOrderInfo = list.get(i-2); XcdDetailInfoView xcdWorkingOrderInfo = list.get(i - 2);
if(xcdWorkingOrderInfo.getWorkingOrderCode()!=null)row.createCell(0).setCellValue(xcdWorkingOrderInfo.getWorkingOrderCode()); if (xcdWorkingOrderInfo.getWorkingOrderCode() != null)
if(xcdWorkingOrderInfo.getWorkingOrderTitle()!=null)row.createCell(1).setCellValue(xcdWorkingOrderInfo.getWorkingOrderTitle()); row.createCell(0).setCellValue(xcdWorkingOrderInfo.getWorkingOrderCode());
if(xcdWorkingOrderInfo.getWorkingOrderDescription()!=null)row.createCell(2).setCellValue(xcdWorkingOrderInfo.getWorkingOrderDescription()); if (xcdWorkingOrderInfo.getWorkingOrderTitle() != null)
if(xcdWorkingOrderInfo.getAskname()!=null)row.createCell(3).setCellValue(xcdWorkingOrderInfo.getAskname()); row.createCell(1).setCellValue(xcdWorkingOrderInfo.getWorkingOrderTitle());
if(xcdWorkingOrderInfo.getSuborigin()!=null)row.createCell(4).setCellValue(xcdWorkingOrderInfo.getSuborigin()); if (xcdWorkingOrderInfo.getWorkingOrderDescription() != null)
if(xcdWorkingOrderInfo.getPriority()!=null)row.createCell(5).setCellValue(xcdWorkingOrderInfo.getPriority()); row.createCell(2).setCellValue(xcdWorkingOrderInfo.getWorkingOrderDescription());
if(xcdWorkingOrderInfo.getProvinceName()!=null)row.createCell(6).setCellValue(xcdWorkingOrderInfo.getProvinceName()); if (xcdWorkingOrderInfo.getAskname() != null)
if(xcdWorkingOrderInfo.getChannelName()!=null)row.createCell(7).setCellValue(xcdWorkingOrderInfo.getChannelName()); row.createCell(3).setCellValue(xcdWorkingOrderInfo.getAskname());
if (xcdWorkingOrderInfo.getSuborigin() != null)
row.createCell(4).setCellValue(xcdWorkingOrderInfo.getSuborigin());
if (xcdWorkingOrderInfo.getPriority() != null)
row.createCell(5).setCellValue(xcdWorkingOrderInfo.getPriority());
if (xcdWorkingOrderInfo.getProvinceName() != null)
row.createCell(6).setCellValue(xcdWorkingOrderInfo.getProvinceName());
if (xcdWorkingOrderInfo.getChannelName() != null)
row.createCell(7).setCellValue(xcdWorkingOrderInfo.getChannelName());
// if(xcdWorkingOrderInfo.getImportanceLevelName()!=null)row.createCell(5).setCellValue(xcdWorkingOrderInfo.getImportanceLevelName()); // if(xcdWorkingOrderInfo.getImportanceLevelName()!=null)row.createCell(5).setCellValue(xcdWorkingOrderInfo.getImportanceLevelName());
if(xcdWorkingOrderInfo.getWarningSourceName()!=null)row.createCell(8).setCellValue(xcdWorkingOrderInfo.getWarningSourceName()); if (xcdWorkingOrderInfo.getWarningSourceName() != null)
if(xcdWorkingOrderInfo.getEventHappenTime()!=null)row.createCell(9).setCellValue(df.format(xcdWorkingOrderInfo.getEventHappenTime())); row.createCell(8).setCellValue(xcdWorkingOrderInfo.getWarningSourceName());
if(xcdWorkingOrderInfo.getBusinessRecoveryTime()!=null)row.createCell(10).setCellValue(df.format(xcdWorkingOrderInfo.getBusinessRecoveryTime())); if (xcdWorkingOrderInfo.getEventHappenTime() != null)
if(xcdWorkingOrderInfo.getEventCompletionTimeline()!=null)row.createCell(11).setCellValue(df.format(xcdWorkingOrderInfo.getEventCompletionTimeline())); row.createCell(9).setCellValue(df.format(xcdWorkingOrderInfo.getEventHappenTime()));
if(xcdWorkingOrderInfo.getActualCompletionTime()!=null)row.createCell(12).setCellValue(df.format(xcdWorkingOrderInfo.getActualCompletionTime())); if (xcdWorkingOrderInfo.getBusinessRecoveryTime() != null)
row.createCell(10).setCellValue(df.format(xcdWorkingOrderInfo.getBusinessRecoveryTime()));
if (xcdWorkingOrderInfo.getEventCompletionTimeline() != null)
row.createCell(11).setCellValue(df.format(xcdWorkingOrderInfo.getEventCompletionTimeline()));
if (xcdWorkingOrderInfo.getActualCompletionTime() != null)
row.createCell(12).setCellValue(df.format(xcdWorkingOrderInfo.getActualCompletionTime()));
// if(xcdWorkingOrderInfo.getClosed()!=null)row.createCell(11).setCellValue(xcdWorkingOrderInfo.getClosed()); // if(xcdWorkingOrderInfo.getClosed()!=null)row.createCell(11).setCellValue(xcdWorkingOrderInfo.getClosed());
// if(xcdWorkingOrderInfo.getOccurReason()!=null)row.createCell(12).setCellValue(xcdWorkingOrderInfo.getOccurReason()); // if(xcdWorkingOrderInfo.getOccurReason()!=null)row.createCell(12).setCellValue(xcdWorkingOrderInfo.getOccurReason());
if(xcdWorkingOrderInfo.getResolvingStatus()!=null)row.createCell(13).setCellValue(xcdWorkingOrderInfo.getResolvingStatus()); if (xcdWorkingOrderInfo.getResolvingStatus() != null)
row.createCell(13).setCellValue(xcdWorkingOrderInfo.getResolvingStatus());
if(xcdWorkingOrderInfo.getWoReasonType()!=null)row.createCell(14).setCellValue(xcdWorkingOrderInfo.getWoReasonType()); if (xcdWorkingOrderInfo.getWoReasonType() != null)
if(xcdWorkingOrderInfo.getWoReasonSubTypeOne()!=null)row.createCell(15).setCellValue(xcdWorkingOrderInfo.getWoReasonSubTypeOne()); row.createCell(14).setCellValue(xcdWorkingOrderInfo.getWoReasonType());
if(xcdWorkingOrderInfo.getWoReasonSubTypeTwo()!=null)row.createCell(16).setCellValue(xcdWorkingOrderInfo.getWoReasonSubTypeTwo()); if (xcdWorkingOrderInfo.getWoReasonSubTypeOne() != null)
if(xcdWorkingOrderInfo.getProposedResolution()!=null)row.createCell(17).setCellValue(xcdWorkingOrderInfo.getProposedResolution()); row.createCell(15).setCellValue(xcdWorkingOrderInfo.getWoReasonSubTypeOne());
if(xcdWorkingOrderInfo.getFailureReason()!=null)row.createCell(18).setCellValue(xcdWorkingOrderInfo.getFailureReason()); if (xcdWorkingOrderInfo.getWoReasonSubTypeTwo() != null)
if(xcdWorkingOrderInfo.getAffectregion()!=null)row.createCell(19).setCellValue(xcdWorkingOrderInfo.getAffectregion()); row.createCell(16).setCellValue(xcdWorkingOrderInfo.getWoReasonSubTypeTwo());
if (xcdWorkingOrderInfo.getProposedResolution() != null)
row.createCell(17).setCellValue(xcdWorkingOrderInfo.getProposedResolution());
if (xcdWorkingOrderInfo.getFailureReason() != null)
row.createCell(18).setCellValue(xcdWorkingOrderInfo.getFailureReason());
if (xcdWorkingOrderInfo.getAffectregion() != null)
row.createCell(19).setCellValue(xcdWorkingOrderInfo.getAffectregion());
} }
...@@ -853,10 +848,11 @@ public class WorkingOrderReasultController { ...@@ -853,10 +848,11 @@ public class WorkingOrderReasultController {
} }
} }
//将string数据类型转换成List<Long>类型 //将string数据类型转换成List<Long>类型
public List<Long> changeStrToList(String[] str){ public List<Long> changeStrToList(String[] str) {
List<Long> list = new ArrayList<Long>(); List<Long> list = new ArrayList<Long>();
for(int i=0;i<str.length;i++){ for (int i = 0; i < str.length; i++) {
list.add(Long.parseLong(str[i])); list.add(Long.parseLong(str[i]));
} }
......
<%--
Created by IntelliJ IDEA.
User: m01
Date: 2018/5/8 0008
Time: 下午 3:46
To change this template use File | Settings | File Templates.
--%>
<%@ 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>h3 {
font-size: 15px;
}</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" overflow-y:scroll>
<div class="tab-bar-bt">
<ul class="nav nav-tabs">
<li><a id="a_profile" href="${ctx}/MonitorOperation/WorkingOrderAnalysis">协查单统计</a></li>
<li><a id="b_profile" href="${ctx}/MonitorOperation/WorkingOrderReasult">协查单明细</a></li>
<li class="active"><a id="a_home" href="#home" data-toggle="tab">定制分析</a></li>
</ul>
</div>
<div class="section" overflow-y:scroll>
<div class="tab-content" overflow-y:scroll>
<!-- -------------------------------------------------------------- 协查单查询结果页面 -------------- ------------------------------------------------ -->
<div class="tab-pane fade in active" id="profile" overflow-y:scroll>
<div class="row" overflow-y:scroll>
<div id="slidePushMenus2" class="cbp-spmenu-push" overflow-y:scroll>
<div class="slideMenu" id="cbp-spmenu-s2" overflow-y:scroll>
<div class="form" overflow-y:scroll>
<tags:GZFX_CustomAnalyis_Time/>
<tags:GZFX_CustomAnalyis_Province/>
<tags:GZFX_CustomAnalyis_Datasource/>
<tags:GZFX_CustomAnalyis_Chinnel/>
<tags:GZFX_CustomAnalyis_Business/>
<tags:GZFX_CustomAnalyis_Kpi/>
<%--<tags:GZFX_CustomAnalyis_IsAnalyised/>--%>
<button id="submit" class="btn btn-primary">提交</button>
<button id="reset" class="btn btn-warning">重置</button>
</div>
</div>
<div class="main col-xs-12">
<div id="mainm2" class="mainm"></div>
<div class="content clearfix">
<div class="block clearfix">
<button id="showLeftPush2" class="menu-trigger btn btn-default"
onclick="toggleMenu('slidePushMenus2')">
<span class="glyphicon glyphicon-list"></span>
</button>
<div class="slide-menu-tags">
<span id="timz_span" class="label label-info"
data-placement="bottom"></span>
<span id="province_span" class="label label-info"
data-placement="bottom"></span>
<span id="kpi_span" class="label label-info"
data-placement="bottom"></span>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="table-header">
<div class='form-inline'>
定制分析列表
<a href="#" id="getdownloadPic_id" class=""
style="float:right;color: rgb(212, 106, 64);"> <span
class="glyphicon glyphicon-download-alt"></span> <span
class="glyphicon-class">导出图片</span>
</a>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a href="#" id="getdownloadData_id" class=""
style="float:right"> <span
class="glyphicon glyphicon-download-alt"></span> <span
class="glyphicon-class">导出数据&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
</a>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</div>
</div>
<br>
<div id='tupian' class="content clearfix">
<%-- <div class='col-xs-6'>
<img src='/image/meimei.jpg' alt='这是一个小美女1'>
<br>
<div class='text-center'><input type="checkbox" name="isSelected"
style="margin: auto;">下载
</div>
</div>
<div class='col-xs-6'>
<img src='/image/meimei.jpg' alt='这是一个小美女1'>
<br>
<div class='text-center '><input type="checkbox" name="isSelected"
style="margin: auto;">下载
</div>
</div>
<div class='col-xs-6'>
<img src='/image/meimei.jpg' alt='这是一个小美女1'>
</div>
<div class='col-xs-6'>
<img src='/image/meimei.jpg' alt='这是一个小美女1'>
</div>
<div class='col-xs-6'>
<img src='/image/meimei.jpg' alt='这是一个小美女1'>
</div>
<div class='col-xs-6'>
<img src='/image/meimei.jpg' alt='这是一个小美女1'>
</div>
1
<br>
<div class='col-xs-6'>
<img src='/image/meimei.jpg' alt='这是一个小美女1'>
</div>
<div class='col-xs-6'>
<img src='/image/meimei.jpg' alt='这是一个小美女1'>
</div>
sada
1
<br>
<div class='col-xs-6'>
<img src='/image/meimei.jpg' alt='这是一个小美女1'>
</div>
<div class='col-xs-6'>
<img src='/image/meimei.jpg' alt='这是一个小美女1'>
</div>
sada
1
<br>--%>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<form action="#" method="get" id="listForm"></form>
<form id="export" action="#" method="post">
<input type="hidden" id="imagesrc" name="imagesrc" value="">
</form>
<input type="hidden" id="xcdJsonId" value='${xcdWorkingOrderInfoJson}'>
</div>
</div>
</div>
</div>
<script type="text/javascript" src="${ctx}/static/js/dygraph-combined2.js"></script>
<script type="text/javascript" src="${ctx}/static/js/dygraph-extra.js"></script>
<script type="text/javascript">
$(document).ready(function() {
initBusiness();//业务
initKpi();//指标
$("#businessList_div").empty();//清空 业务
$("#allBusiness").prop("checked",false);//取消选择 ‘全选’
$("#kpiList_div").empty();//清空
$("#allKpi_div").prop("checked",false);//取消全选
})
</script>
<script type="text/javascript">
$("#submit").on('click', function () {
//获取用户的选择
var timz = getStatsPeriodString();//选择的时间
var provinces = getSelectedProvinces();//勾选的省份
var provinceName = getSelectedProvinceName();//勾选的省份名字
var kpis = getSelectedKpi();//勾选的指标
var kpisName = getSelectedKpiName();//勾选的指标名字
var kpisNameStr = kpisName.join('-');
if (timz === "") {
alert("时间必选");
return;
}
if (typeof(provinces) == "undefined" || provinces.length === 0) {
alert("省份必选");
return;
}
if (kpis.length === 0) {
alert("指标必选");
return;
}
//请求
timz=getPeriodStats();
var timzStr = timz.join('&');
var provinceStr = provinces;
var kpiStr = kpis.join('-');
var url = "${ctx}/MonitorOperation/CustomAnalysis/submit/"
+ timzStr + "/" + provinceStr + "/" + kpiStr;
$.ajax({
url: url,
type: 'GET',
dataType: 'json',
timeout: 10000,
cache: false,
error: solveError,
success: usepicData
});
function solveError(XMLHttpRequest, textStatus, errorThrown) {//处理ajax 异常情况
toggleMenu('slidePushMenus2');//隐藏筛选项
// 状态码
console.log(XMLHttpRequest.status);
// 状态
console.log(XMLHttpRequest.readyState);
// 错误信息
console.log(textStatus);
}
function usepicData(data) {//处理返回的数据
toggleMenu('slidePushMenus2');//隐藏筛选项
showSpanData();//显示标签栏的数据
showReturnData(data);//处理返回数据
}
function showReturnData(data) {
var json = eval(data);
var allContent = "";
$.each(json, function (index) {
var picUrl = json[index].picUrl;
var dataUrl = json[index].dataUrl;
var div_col_xs_6 = "<div class='col-xs-6'>";
div_col_xs_6 = div_col_xs_6 + "<img style='width: 100%;' src='" + picUrl + "' alt='" + dataUrl + "'>";
div_col_xs_6 = div_col_xs_6 + "<br>";
div_col_xs_6 = div_col_xs_6 + "<div class='text-center '>";
div_col_xs_6 = div_col_xs_6 + "<input type='checkbox' name='downloadData' style='margin: auto;' picUrl='" + picUrl + "' dataUrl='" + dataUrl + "'>下载";
div_col_xs_6 = div_col_xs_6 + "</div>";
div_col_xs_6 = div_col_xs_6 + "</div>";
allContent = allContent + div_col_xs_6;
});
$("#tupian").empty();
// console.log(allContent);
$("#tupian").append(allContent);
}
function showSpanData() {//显示标签栏的数据
$("#timz_span")
.text('时间')
.append($("<span class='badge'></span>").text(timz.length))
.attr('data-original-title', timzStr).tooltip();
$("#province_span")
.text('省份')
.append($("<span class='badge'></span>").text('1'))
.attr('data-original-title', provinceName).tooltip();
$("#kpi_span")
.text('指标')
.append($("<span class='badge'></span>").text(kpis.length))
.attr('data-original-title', kpisNameStr).tooltip();
}
});
$('#reset').on('click', function () {//重置
initDateStats();//时间
initProvince();//省份
initChannel();//渠道
initDataSource();//数据来源
initBusiness();//业务
initKpi();//指标
// initReport();//定制分析
});
function getDateStr() {
var d = new Date();
var year = d.getFullYear();
var month = change(d.getMonth() + 1);
var day = change(d.getDate());
var hour = change(d.getHours());
var minute = change(d.getMinutes());
var second = change(d.getSeconds());
var time = year + '_' + month + '_' + day + '_' + hour + '_' + minute + '_' + second;
return time;
}
function change(t) {
if (t < 10) {
return "0" + t;
} else {
return t;
}
}
function getdownloadDataSelectedArray(){
var downloadDataSelectedArray = new Array();
var downloadDataCheckbox=document.getElementsByName("downloadData");
var downloadDataCheckboxlen=downloadDataCheckbox.length;
for (var iii=0;iii<downloadDataCheckbox.length;iii++){
if(downloadDataCheckbox[iii].checked){
var dataUrl =downloadDataCheckbox[iii].getAttribute('dataUrl');
var picUrl =downloadDataCheckbox[iii].getAttribute('picUrl');
dataUrl = dataUrl.replace(/\//g, '|');
var ind = picUrl.lastIndexOf("/");
picUrl = picUrl.substr(ind + 1);
// console.log("dataUrl == "+dataUrl);
// console.log("picUrl =="+picUrl);
downloadDataSelectedArray.push(picUrl + "_" + dataUrl);
}
}
return downloadDataSelectedArray;
}
function randomString(len) {
len = len || 32;
var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678'; /****默认去掉了容易混淆的字符oOLl,9gq,Vv,Uu,I1****/
var maxPos = $chars.length;
var pwd = '';
for (i = 0; i < len; i++) {
pwd += $chars.charAt(Math.floor(Math.random() * maxPos));
}
return pwd;
}
function downloadExcel(excelName,downloadDataSelectedStr){
// $(e).attr('href', '/MonitorOperation/CustomAnalysis/downloadData/' + excelName + "/" + downloadDataSelectedStr);
// console.log('/MonitorOperation/CustomAnalysis/downloadData/' + excelName + "/" + downloadDataSelectedStr);
// $(e).click();
/*var id=randomString();
var a=$('<a id="'+id+'" href="'+'/MonitorOperation/CustomAnalysis/downloadData1/' + excelName + "/" + downloadDataSelectedStr+'">');
a.get(0).click();*/
var listForm=$("#export");
//alert("${ctx}/MonitorOperation/CustomAnalysis/downloadData1?excelName="+excelName+"&fileStr="+downloadDataSelectedStr);
listForm.attr("action","${ctx}/MonitorOperation/CustomAnalysis/downloadData1?excelName="+excelName+"&fileStr="+downloadDataSelectedStr);
listForm.submit();
listForm.attr("action","#");
return false;//阻止页面跳转
}
$('#getdownloadData_id').on('click', function () {//下载数据
var excelName = "定制分析数据_" + getDateStr() + ".xls";
// console.log("---+++---");
var arrAAA=getdownloadDataSelectedArray();
// console.log("arr.length "+arrAAA.length);
if (arrAAA.length === 0) {
alert('没有选择');
return;
}
var downloadDataSelectedStr = arrAAA.join("@");
// alert("downloadDataSelectedStr = "+downloadDataSelectedStr);
// alert("downloadDataSelectedStr = "+downloadDataSelectedStr);
var excelName = excelName;
// console.log("&&&&&&");
downloadExcel(excelName,downloadDataSelectedStr);
// console.log("&&&&&&-+++--");
/* $(this).attr('href', '/MonitorOperation/CustomAnalysis/downloadData/' + excelName + "/" + downloadDataSelectedStr);
// console.log('/MonitorOperation/CustomAnalysis/downloadData/' + excelName + "/" + downloadDataSelectedStr);
$(this).click();
return false;//阻止页面跳转*/
});
$("#getdownloadPic_id").on('click', function () {
// console.log(")))");
$('input[name="downloadData"]:checked').each(function (i) {
var picUrl = $(this).attr('picUrl');
var ind = picUrl.lastIndexOf("/");
// console.log("ind " + ind);
var download = i + "_" + picUrl.substr(ind + 1);
// console.log("download " + download);
var link = document.createElement('a');
link.setAttribute("download", download);
link.href = picUrl;
link.click();
// console.log("00000 " + picUrl);
sleep(1500);
// console.log("00000 ");
});
});
function cancelselectbusinessandkpi(){
$("#businessList_div").empty();//清空 业务
$("#allBusiness").prop("checked",false);//取消选择 ‘全选’
$("#kpiList_div").empty();//清空
$("#allKpi_div").prop("checked",false);//取消全选
}
function sleep(numberMillis) {
var now = new Date();
var exitTime = now.getTime() + numberMillis;
while (true) {
now = new Date();
if (now.getTime() > exitTime)
return;
}
}
</script>
</body>
</html>
\ No newline at end of file
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<ul class="nav nav-tabs"> <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 id="a_profile" href="${ctx}/MonitorOperation/WorkingOrderReasult">协查单明细</a></li> <li><a id="a_profile" href="${ctx}/MonitorOperation/WorkingOrderReasult">协查单明细</a></li>
<li><a id="b_home" href="${ctx}/MonitorOperation/CustomAnalysis">定制分析</a></li>>
<%-- <li><a id="a_profile" href="${ctx}/MonitorOperation/WorkingOrderAnalysisDetail">协查单明细展示</a> </li> --%> <%-- <li><a id="a_profile" href="${ctx}/MonitorOperation/WorkingOrderAnalysisDetail">协查单明细展示</a> </li> --%>
</ul> </ul>
</div> </div>
......
<%@ page language="java" pageEncoding="UTF-8" %> <%@ page language="java" pageEncoding="UTF-8" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="tags" tagdir="/WEB-INF/tags"%> <%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags" %> <%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags" %>
<c:set var="ctx" value="${pageContext.request.contextPath}"/> <c:set var="ctx" value="${pageContext.request.contextPath}"/>
<!-- add by wang feng --> <!-- add by wang feng -->
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
<meta http-equiv="keywords" content="keyword1,keyword2,keyword3"> <meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
<meta http-equiv="description" content="This is my page"> <meta http-equiv="description" content="This is my page">
<link rel="stylesheet" type="text/css" href="${ctx}/static/css/demo.css" /> <link rel="stylesheet" type="text/css" href="${ctx}/static/css/demo.css"/>
<link rel="stylesheet" type="text/css" href="${ctx}/static/css/component.css" /> <link rel="stylesheet" type="text/css" href="${ctx}/static/css/component.css"/>
<script src="${ctx}/static/js/xcdResultTable.js"></script> <script src="${ctx}/static/js/xcdResultTable.js"></script>
<script src="${ctx}/static/js/modernizr.custom.js"></script> <script src="${ctx}/static/js/modernizr.custom.js"></script>
...@@ -28,15 +28,15 @@ ...@@ -28,15 +28,15 @@
<script type = "text/javascript"> <script type="text/javascript">
$(function(){ $(function () {
xcdFindTable(); xcdFindTable();
initDateStats();//协查单查询页面的是案件初始化 initDateStats();//协查单查询页面的是案件初始化
}); });
//根据选择的告警,将其告警id传到协查单更新页面 //根据选择的告警,将其告警id传到协查单更新页面
function updateWorkingOrder(){ function updateWorkingOrder() {
//页面刷新分页 var radio=document.getElementsByName("update"); //页面刷新分页 var radio=document.getElementsByName("update");
//页面刷新分页 var radioLength=radio.length; //页面刷新分页 var radioLength=radio.length;
//页面刷新分页 for(var i=0;i<radioLength;i++) //页面刷新分页 for(var i=0;i<radioLength;i++)
...@@ -46,25 +46,37 @@ ...@@ -46,25 +46,37 @@
//页面刷新分页 var workingOrderId=radio[i].value; //页面刷新分页 var workingOrderId=radio[i].value;
// alert(xcdId); // alert(xcdId);
location.href="${ctx}/MonitorOperation/WorkingOrderUpdate"+"?workingOrderId="+xcdId; location.href = "${ctx}/MonitorOperation/WorkingOrderUpdate" + "?workingOrderId=" + xcdId;
/* /*
seajs.use('${ctx}/static/artDialog/src/dialog',function(dialog) { seajs.use('
${ctx}/static/artDialog/src/dialog',function(dialog) {
var d = dialog({ var d = dialog({
title : '更新协查单', title : '更新协查单',
fixed:true, fixed:true,
width:'420px', width:'420px',
height:'400px', height:'400px',
content : "<p><div ><iframe width='100%' height='100%' frameborder='0' scrolling='no' src='${ctx}/MonitorOperation/WorkingOrderUpdate?workingOrderId=" content : "<p><div ><iframe width='100%' height='100%' frameborder='0' scrolling='no' src='
${ctx}/MonitorOperation/WorkingOrderUpdate?workingOrderId="
+ workingOrderId+ "'></iframe></div></p>", + workingOrderId+ "'></iframe></div></p>",
}); });
d.showModal(); d.showModal();
}); });
*/ */
/* /*
//页面刷新分页 art.dialog.open('${ctx}/MonitorOperation/WorkingOrderUpdate?workingOrderId='+workingOrderId,{ //页面刷新分页 art.dialog.open('
art.dialog.open('${ctx}/MonitorOperation/WorkingOrderUpdate?workingOrderId='+xcdId,{
${ctx}/MonitorOperation/WorkingOrderUpdate?workingOrderId='+workingOrderId,{
art.dialog.open('
${ctx}/MonitorOperation/WorkingOrderUpdate?workingOrderId='+xcdId,{
title:'更新协查单', title:'更新协查单',
width:'380px', width:'380px',
...@@ -72,19 +84,31 @@ ...@@ -72,19 +84,31 @@
ok: function(){ ok: function(){
var iframe=this.iframe.contentWindow; var iframe=this.iframe.contentWindow;
var form=iframe.document.getElementById('updateForm'); var form=iframe.document.getElementById('updateForm');
form.action='${ctx}/MonitorOperation/WorkingOrderUpdate/update'; form.action='
${ctx}/MonitorOperation/WorkingOrderUpdate/update';
form.submit(); form.submit();
this.hide(); this.hide();
// location.href="${ctx}/MonitorOperation/WorkingOrderReasult"; // location.href="
${ctx}/MonitorOperation/WorkingOrderReasult";
//window.top.location.reload(); //window.top.location.reload();
//$("#xcd_table").load("#xcd_table"); //$("#xcd_table").load("#xcd_table");
// LoadData(); // LoadData();
var url=String(window.document.location.href); var url=String(window.document.location.href);
var allargs = url.split("?")[1]; var allargs = url.split("?")[1];
if(allargs){ if(allargs){
$("body").load("${ctx}/MonitorOperation/WorkingOrderReasult?"+allargs);//剧本刷新table中的内容,不要刷新页面,一刷新页面,对话框就被销毁,操作数据库就失败 $("body").load("
${ctx}/MonitorOperation/WorkingOrderReasult?"+allargs);//剧本刷新table中的内容,不要刷新页面,一刷新页面,对话框就被销毁,操作数据库就失败
}else{ }else{
$("body").load("${ctx}/MonitorOperation/WorkingOrderReasult"); $("body").load("
${ctx}/MonitorOperation/WorkingOrderReasult");
} }
return false; return false;
}, },
...@@ -93,7 +117,10 @@ ...@@ -93,7 +117,10 @@
}, },
cancel:true, cancel:true,
}); });
var href="${ctx}/MonitorOperation/WorkingOrderReasult/changeTable?xcdId="+"-1"; var href="
${ctx}/MonitorOperation/WorkingOrderReasult/changeTable?xcdId="+"-1";
$.ajax({ $.ajax({
type : 'GET', type : 'GET',
contentType : 'application/json', contentType : 'application/json',
...@@ -109,25 +136,26 @@ ...@@ -109,25 +136,26 @@
*/ */
} }
// }
// } // }
// }
</script> </script>
</head> </head>
<body> <body>
<div id="sticky-wrap"> </div> <div id="sticky-wrap"></div>
<div> <div>
<div class="container"> <div class="container">
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="${ctx}/index">首页</a></li> <li><a href="${ctx}/index">首页</a></li>
<li>监控运营</li> <li>监控运营</li>
<li class="active">协查单管理</li> <li class="active">协查单管理</li>
</ol> </ol>
</div> </div>
</div> </div>
<div id="main-container main-tab-container"> <div id="main-container main-tab-container">
...@@ -135,8 +163,9 @@ ...@@ -135,8 +163,9 @@
<div class="tab-bar-bt"> <div class="tab-bar-bt">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li><a id="a_home" href="${ctx}/MonitorOperation/WorkingOrderAnalysis">协查单统计</a> </li> <li><a id="a_home" href="${ctx}/MonitorOperation/WorkingOrderAnalysis">协查单统计</a></li>
<li class="active"><a id="a_profile" href="#profile" data-toggle="tab">协查单明细</a></li> <li class="active"><a id="a_profile" href="#profile" data-toggle="tab">协查单明细</a></li>
<li><a id="b_home" href="${ctx}/MonitorOperation/CustomAnalysis">定制分析</a></li>
</ul> </ul>
</div> </div>
<div class="section"> <div class="section">
...@@ -151,38 +180,53 @@ ...@@ -151,38 +180,53 @@
<div class="form"> <div class="form">
<tags:GZFX_Period_stats/> <tags:GZFX_Period_stats/>
<tags:JCS_datasource_channle/> <tags:JCS_datasource_channle/>
<tags:XCD_WarningSource /> <tags:XCD_WarningSource/>
<tags:Public_ImportanceLevelTag/> <tags:Public_ImportanceLevelTag/>
<tags:GJFX_Provider_Province /> <tags:GJFX_Provider_Province/>
<!-- tag:XCD_IfClosed /> --> <!-- tag:XCD_IfClosed /> -->
<div id="workingOrderIDDiv" class="slide-menu-option"> <div id="workingOrderIDDiv" class="slide-menu-option">
<label for="">协查单编号</label>&nbsp;&nbsp; <label for="">协查单编号</label>&nbsp;&nbsp;
<input id="workingOrderID" class="form-control" type="text" style="width:250px;" onFocus=""> <input id="workingOrderID" class="form-control" type="text" style="width:250px;"
onFocus="">
</div> </div>
<tags:GJFX_AnylayReport/>
<button id="submit2" class="btn btn-primary">提交</button> <button id="submit2" class="btn btn-primary">提交</button>
<button id="reset" class="btn btn-warning" onclick="Reset()" >重置</button> <button id="reset" class="btn btn-warning" onclick="Reset()">重置</button>
</div> </div>
</div> </div>
<div class="main col-xs-12"> <div class="main col-xs-12">
<div id="mainm2" class="mainm" ></div> <div id="mainm2" class="mainm"></div>
<div class="content clearfix"> <div class="content clearfix">
<div class="block clearfix"> <div class="block clearfix">
<button id="showLeftPush2" class="menu-trigger btn btn-default" onclick="toggleMenu('slidePushMenus2')"> <button id="showLeftPush2" class="menu-trigger btn btn-default"
onclick="toggleMenu('slidePushMenus2')">
<span class="glyphicon glyphicon-list"></span> <span class="glyphicon glyphicon-list"></span>
</button> </button>
<div class="slide-menu-tags"> <div class="slide-menu-tags">
<span id="warningSource2" class="label label-info" data-placement="bottom"></span> <span id="warningSource2" class="label label-info"
<span id="PeriodTag3" class="label label-info" data-placement="bottom"></span> data-placement="bottom"></span>
<span id="ProviderTag" class="label label-info" data-placement="bottom"></span> <span id="PeriodTag3" class="label label-info"
<span id="ProvinceTag" class="label label-info" data-placement="bottom"></span> data-placement="bottom"></span>
<span id="DataSourceTag" class="label label-info" data-placement="bottom" ></span> <span id="ProviderTag" class="label label-info"
<span id="ChannelTag3" class="label label-info" data-placement="bottom"></span> data-placement="bottom"></span>
<span id="ImportanceLevelTag" class="label label-info" data-placement="bottom"></span> <span id="ProvinceTag" class="label label-info"
<span id="suboriginTag" class="label label-info" data-placement="bottom"></span> data-placement="bottom"></span>
<span id="xcdcodeid" class="label label-info" data-placement="bottom"></span> <span id="DataSourceTag" class="label label-info"
<span id="IfClosedTag3" data-placement="bottom">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> data-placement="bottom"></span>
<span id="ChannelTag3" class="label label-info"
data-placement="bottom"></span>
<span id="ImportanceLevelTag" class="label label-info"
data-placement="bottom"></span>
<span id="suboriginTag" class="label label-info"
data-placement="bottom"></span>
<span id="xcdcodeid" class="label label-info"
data-placement="bottom"></span>
<span id="IfClosedTag3"> </span>
<span id="reportsTag" class="label label-info"
data-placement="bottom" data-placement="bottom"></span>
</div> </div>
<div class="bt-list-import"> <div class="bt-list-import">
...@@ -195,7 +239,7 @@ ...@@ -195,7 +239,7 @@
<!-- 结束 --> <!-- 结束 -->
<!-- <table class="table table-hover table-striped" id="xcd_table"> <!-- <table class="table table-hover table-striped" id="xcd_table">
<thead> <thead>
<tr> <tr>
<th>选择</th> <th>选择</th>
...@@ -247,8 +291,10 @@ ...@@ -247,8 +291,10 @@
<div class="col-xs-12"> <div class="col-xs-12">
<div class="table-header">协查单列表 <div class="table-header">协查单列表
<shiro:hasAnyRoles name="admin,dataAnalysis,businessAnalysis"> <shiro:hasAnyRoles name="admin,dataAnalysis,businessAnalysis">
<div class="bt-list-import" > <div class="bt-list-import">
<input type="button" id="updateButton"class="btn btn-primary" style="margin-right:13px;" value="更新协查单" disabled=true onclick="updateWorkingOrder()"> <input type="button" id="updateButton" class="btn btn-primary"
style="margin-right:13px;" value="更新协查单" disabled=true
onclick="updateWorkingOrder()">
</div> </div>
</shiro:hasAnyRoles> </shiro:hasAnyRoles>
</div> </div>
...@@ -257,8 +303,6 @@ ...@@ -257,8 +303,6 @@
</div> </div>
<!-- 刷新分页 tags:WorkingOrader_pagination page="${xcdWorkingOrderInfoS}" <!-- 刷新分页 tags:WorkingOrader_pagination page="${xcdWorkingOrderInfoS}"
paginationSize="${pageSize}" /> --> paginationSize="${pageSize}" /> -->
</div> </div>
...@@ -268,14 +312,7 @@ ...@@ -268,14 +312,7 @@
</div> </div>
</div> </div>
<form action="#" method="get" id="listForm"></form> <form action="#" method="get" id="listForm"></form>
<!-- <input type="hidden" id="CurTabId" name="CurTabId" value="${CurTabId}" />
<input type="hidden" id="time2" name="time2" value=""/>
<input type="hidden" id="channel3" name="channel3" value=""/>
<input type="hidden" id="warningSource2" name="warningSource2" value=""/>
<input type="hidden" id="importantLevel2" name="importantLevel2" value=""/>
<input type="hidden" id="province2" name="province2" value=""/>
<input type="hidden" id="ifClosed2" name="ifClosed2" value=""/>
-->
<input type="hidden" id="xcdJsonId" value='${xcdWorkingOrderInfoJson}'> <input type="hidden" id="xcdJsonId" value='${xcdWorkingOrderInfoJson}'>
...@@ -283,7 +320,7 @@ ...@@ -283,7 +320,7 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript"> //add by Wang Feng <script type="text/javascript"> //add by Wang Feng
...@@ -307,196 +344,193 @@ ...@@ -307,196 +344,193 @@
disable2(); disable2();
} }
*/ */
$(function(){ $(function () {
$("#PeriodTag3").text("最近一个月"); $("#PeriodTag3").text("最近一个月");
if('<%=request.getParameter("xcdId")%>'==-8){ if ('<%=request.getParameter("xcdId")%>' == -8) {
$("#PeriodTag3").empty(); $("#PeriodTag3").empty();
} }
if('<%=request.getParameter("xcdId")%>'==-2){ if ('<%=request.getParameter("xcdId")%>' == -2) {
$("#PeriodTag3").empty(); $("#PeriodTag3").empty();
$("#PeriodTag3").text("最近一个月"); $("#PeriodTag3").text("最近一个月");
//省份标签 //省份标签
$('#ProvinceTag').text('省份').append($("<span class='badge'></span>").text(1)).attr('data-original-title','<%=request.getParameter("ProvinceTag")%>').tooltip(); $('#ProvinceTag').text('省份').append($("<span class='badge'></span>").text(1)).attr('data-original-title', '<%=request.getParameter("ProvinceTag")%>').tooltip();
/* 修改筛选项标签 End*/ /* 修改筛选项标签 End*/
}else if('<%=request.getParameter("xcdId")%>'==-3){ } else if ('<%=request.getParameter("xcdId")%>' == -3) {
$("#PeriodTag3").empty(); $("#PeriodTag3").empty();
$("#PeriodTag3").text("最近一个月"); $("#PeriodTag3").text("最近一个月");
//集成商标签/改为时间子来源 //集成商标签/改为时间子来源
$('#suboriginTag').text('<%=request.getParameter("suborigin")%>'); $('#suboriginTag').text('<%=request.getParameter("suborigin")%>');
}else if('<%=request.getParameter("xcdId")%>'==-4){ } else if ('<%=request.getParameter("xcdId")%>' == -4) {
$("#PeriodTag3").empty(); $("#PeriodTag3").empty();
//时间筛选项 //时间筛选项
$('#PeriodTag3').text("时间范围").attr('data-original-title','<%=request.getParameter("PeriodTag")%>').tooltip(); $('#PeriodTag3').text("时间范围").attr('data-original-title', '<%=request.getParameter("PeriodTag")%>').tooltip();
//渠道刷选项 //渠道刷选项
$("#ChannelTag3").text("渠道").append($("<span class='badge'></span>").text('<%=request.getParameter("ChannelTag")%>'.split("/")[0])).attr('data-original-title','<%=request.getParameter("ChannelTag")%>'.split("/")[2]).tooltip(); $("#ChannelTag3").text("渠道").append($("<span class='badge'></span>").text('<%=request.getParameter("ChannelTag")%>'.split("/")[0])).attr('data-original-title', '<%=request.getParameter("ChannelTag")%>'.split("/")[2]).tooltip();
//告警来源筛选项 //告警来源筛选项
$('#warningSource2').text('告警来源').attr('data-original-title','<%=request.getParameter("WarningSourceTag")%>'.split("/")[1]).tooltip(); $('#warningSource2').text('告警来源').attr('data-original-title', '<%=request.getParameter("WarningSourceTag")%>'.split("/")[1]).tooltip();
//告警级别标签 //告警级别标签
$('#ImportanceLevelTag').text('级别').append($("<span class='badge'></span>").text('<%=request.getParameter("ImportanceLevelTag")%>'.split("/")[0])).attr('data-original-title','<%=request.getParameter("ImportanceLevelTag")%>'.split("/")[2]).tooltip(); $('#ImportanceLevelTag').text('级别').append($("<span class='badge'></span>").text('<%=request.getParameter("ImportanceLevelTag")%>'.split("/")[0])).attr('data-original-title', '<%=request.getParameter("ImportanceLevelTag")%>'.split("/")[2]).tooltip();
//集成商标签 //集成商标签
$('#ProviderTag').text('集成商') $('#ProviderTag').text('集成商')
.append($("<span class='badge'></span>").text('<%=request.getParameter("ProviderTag")%>'.split("/")[0]))//添加数值 .append($("<span class='badge'></span>").text('<%=request.getParameter("ProviderTag")%>'.split("/")[0]))//添加数值
.attr('data-original-title','<%=request.getParameter("ProviderTag")%>'.split("/")[2]) .attr('data-original-title', '<%=request.getParameter("ProviderTag")%>'.split("/")[2])
.tooltip(); //修改tooltip值,初始化tooltip .tooltip(); //修改tooltip值,初始化tooltip
//省份标签 //省份标签
$('#ProvinceTag').text('省份').append($("<span class='badge'></span>").text('<%=request.getParameter("ProvinceTag")%>'.split("/")[0])).attr('data-original-title','<%=request.getParameter("ProvinceTag")%>'.split("/")[1]).tooltip(); $('#ProvinceTag').text('省份').append($("<span class='badge'></span>").text('<%=request.getParameter("ProvinceTag")%>'.split("/")[0])).attr('data-original-title', '<%=request.getParameter("ProvinceTag")%>'.split("/")[1]).tooltip();
/* 修改筛选项标签 End*/ /* 修改筛选项标签 End*/
//数据来源标签 //数据来源标签
$('#DataSourceTag').text('数据来源').append($("<span class='badge'></span>").text('<%=request.getParameter("DataSourceTag")%>'.split("/")[0])).attr('data-original-title','<%=request.getParameter("DataSourceTag")%>'.split("/")[2]).tooltip(); $('#DataSourceTag').text('数据来源').append($("<span class='badge'></span>").text('<%=request.getParameter("DataSourceTag")%>'.split("/")[0])).attr('data-original-title', '<%=request.getParameter("DataSourceTag")%>'.split("/")[2]).tooltip();
}else if('<%=request.getParameter("xcdId")%>'==-5){ } else if ('<%=request.getParameter("xcdId")%>' == -5) {
$("#PeriodTag3").empty(); $("#PeriodTag3").empty();
//时间筛选项 //时间筛选项
$('#PeriodTag3').text("时间范围").attr('data-original-title','<%=request.getParameter("PeriodTag")%>').tooltip(); $('#PeriodTag3').text("时间范围").attr('data-original-title', '<%=request.getParameter("PeriodTag")%>').tooltip();
//渠道刷选项 //渠道刷选项
$("#ChannelTag3").text("渠道").append($("<span class='badge'></span>").text('<%=request.getParameter("ChannelTag")%>'.split("/")[0])).attr('data-original-title','<%=request.getParameter("ChannelTag")%>'.split("/")[2]).tooltip(); $("#ChannelTag3").text("渠道").append($("<span class='badge'></span>").text('<%=request.getParameter("ChannelTag")%>'.split("/")[0])).attr('data-original-title', '<%=request.getParameter("ChannelTag")%>'.split("/")[2]).tooltip();
//告警来源筛选项 //告警来源筛选项
$('#warningSource2').text('告警来源').attr('data-original-title','<%=request.getParameter("WarningSourceTag")%>'.split("/")[1]).tooltip(); $('#warningSource2').text('告警来源').attr('data-original-title', '<%=request.getParameter("WarningSourceTag")%>'.split("/")[1]).tooltip();
//告警级别标签 //告警级别标签
$('#ImportanceLevelTag').text('级别').append($("<span class='badge'></span>").text('<%=request.getParameter("ImportanceLevelTag")%>'.split("/")[0])).attr('data-original-title','<%=request.getParameter("ImportanceLevelTag")%>'.split("/")[2]).tooltip(); $('#ImportanceLevelTag').text('级别').append($("<span class='badge'></span>").text('<%=request.getParameter("ImportanceLevelTag")%>'.split("/")[0])).attr('data-original-title', '<%=request.getParameter("ImportanceLevelTag")%>'.split("/")[2]).tooltip();
//集成商标签 //集成商标签
$('#ProviderTag').text('集成商') $('#ProviderTag').text('集成商')
.append($("<span class='badge'></span>").text('<%=request.getParameter("ProviderTag")%>'.split("/")[0]))//添加数值 .append($("<span class='badge'></span>").text('<%=request.getParameter("ProviderTag")%>'.split("/")[0]))//添加数值
.attr('data-original-title','<%=request.getParameter("ProviderTag")%>'.split("/")[2]) .attr('data-original-title', '<%=request.getParameter("ProviderTag")%>'.split("/")[2])
.tooltip(); //修改tooltip值,初始化tooltip .tooltip(); //修改tooltip值,初始化tooltip
//省份标签 //省份标签
$('#ProvinceTag').text('省份').append($("<span class='badge'></span>").text('<%=request.getParameter("ProvinceTag")%>'.split("/")[0])).attr('data-original-title','<%=request.getParameter("ProvinceTag")%>'.split("/")[2]).tooltip(); $('#ProvinceTag').text('省份').append($("<span class='badge'></span>").text('<%=request.getParameter("ProvinceTag")%>'.split("/")[0])).attr('data-original-title', '<%=request.getParameter("ProvinceTag")%>'.split("/")[2]).tooltip();
/* 修改筛选项标签 End*/ /* 修改筛选项标签 End*/
//数据来源标签 //数据来源标签
$('#DataSourceTag').text('数据来源').append($("<span class='badge'></span>").text('<%=request.getParameter("DataSourceTag")%>'.split("/")[0])).attr('data-original-title','<%=request.getParameter("DataSourceTag")%>'.split("/")[2]).tooltip(); $('#DataSourceTag').text('数据来源').append($("<span class='badge'></span>").text('<%=request.getParameter("DataSourceTag")%>'.split("/")[0])).attr('data-original-title', '<%=request.getParameter("DataSourceTag")%>'.split("/")[2]).tooltip();
var sub='<%=request.getParameter("suborigin")%>'; var sub = '<%=request.getParameter("suborigin")%>';
$('#suboriginTag').text(sub.split("/")[1]); $('#suboriginTag').text(sub.split("/")[1]);
}else if('<%=request.getParameter("xcdId")%>'==-6){ } else if ('<%=request.getParameter("xcdId")%>' == -6) {
$("#PeriodTag3").empty(); $("#PeriodTag3").empty();
//时间筛选项 //时间筛选项
$('#PeriodTag3').text("时间范围").attr('data-original-title','<%=request.getParameter("PeriodTag")%>').tooltip(); $('#PeriodTag3').text("时间范围").attr('data-original-title', '<%=request.getParameter("PeriodTag")%>').tooltip();
}else if('<%=request.getParameter("xcdId")%>'==-7){ } else if ('<%=request.getParameter("xcdId")%>' == -7) {
$("#PeriodTag3").empty(); $("#PeriodTag3").empty();
//时间筛选项 //时间筛选项
$('#PeriodTag3').text("时间范围").attr('data-original-title','<%=request.getParameter("PeriodTag")%>').tooltip(); $('#PeriodTag3').text("时间范围").attr('data-original-title', '<%=request.getParameter("PeriodTag")%>').tooltip();
//渠道刷选项 //渠道刷选项
$("#ChannelTag3").text("渠道").append($("<span class='badge'></span>").text('<%=request.getParameter("ChannelTag")%>'.split("/")[0])).attr('data-original-title','<%=request.getParameter("ChannelTag")%>'.split("/")[2]).tooltip(); $("#ChannelTag3").text("渠道").append($("<span class='badge'></span>").text('<%=request.getParameter("ChannelTag")%>'.split("/")[0])).attr('data-original-title', '<%=request.getParameter("ChannelTag")%>'.split("/")[2]).tooltip();
//告警来源筛选项 //告警来源筛选项
$('#warningSource2').text('告警来源').attr('data-original-title','<%=request.getParameter("WarningSourceTag")%>'.split("/")[1]).tooltip(); $('#warningSource2').text('告警来源').attr('data-original-title', '<%=request.getParameter("WarningSourceTag")%>'.split("/")[1]).tooltip();
//告警级别标签 //告警级别标签
$('#ImportanceLevelTag').text('级别').append($("<span class='badge'></span>").text('<%=request.getParameter("ImportanceLevelTag")%>'.split("/")[0])).attr('data-original-title','<%=request.getParameter("ImportanceLevelTag")%>'.split("/")[2]).tooltip(); $('#ImportanceLevelTag').text('级别').append($("<span class='badge'></span>").text('<%=request.getParameter("ImportanceLevelTag")%>'.split("/")[0])).attr('data-original-title', '<%=request.getParameter("ImportanceLevelTag")%>'.split("/")[2]).tooltip();
//集成商标签 //集成商标签
$('#ProviderTag').text('集成商') $('#ProviderTag').text('集成商')
.append($("<span class='badge'></span>").text('<%=request.getParameter("ProviderTag")%>'.split("/")[0]))//添加数值 .append($("<span class='badge'></span>").text('<%=request.getParameter("ProviderTag")%>'.split("/")[0]))//添加数值
.attr('data-original-title','<%=request.getParameter("ProviderTag")%>'.split("/")[2]) .attr('data-original-title', '<%=request.getParameter("ProviderTag")%>'.split("/")[2])
.tooltip(); //修改tooltip值,初始化tooltip .tooltip(); //修改tooltip值,初始化tooltip
//省份标签 //省份标签
$('#ProvinceTag').text('省份').append($("<span class='badge'></span>").text('<%=request.getParameter("ProvinceTag")%>'.split("/")[0])).attr('data-original-title','<%=request.getParameter("ProvinceTag")%>'.split("/")[2]).tooltip(); $('#ProvinceTag').text('省份').append($("<span class='badge'></span>").text('<%=request.getParameter("ProvinceTag")%>'.split("/")[0])).attr('data-original-title', '<%=request.getParameter("ProvinceTag")%>'.split("/")[2]).tooltip();
/* 修改筛选项标签 End*/ /* 修改筛选项标签 End*/
//数据来源标签 //数据来源标签
$('#DataSourceTag').text('数据来源').append($("<span class='badge'></span>").text('<%=request.getParameter("DataSourceTag")%>'.split("/")[0])).attr('data-original-title','<%=request.getParameter("DataSourceTag")%>'.split("/")[2]).tooltip(); $('#DataSourceTag').text('数据来源').append($("<span class='badge'></span>").text('<%=request.getParameter("DataSourceTag")%>'.split("/")[0])).attr('data-original-title', '<%=request.getParameter("DataSourceTag")%>'.split("/")[2]).tooltip();
} }
var upLoadExcel="${ctx}/MonitorOperation/WorkingOrderReasult/uploadexcel?time2="+"-1" var upLoadExcel = "${ctx}/MonitorOperation/WorkingOrderReasult/uploadexcel?time2=" + "-1"
+"&channel2="+"-1" + "&channel2=" + "-1"
+"&warningSource2="+"-1" + "&warningSource2=" + "-1"
+"&importantLevel2="+"-1" + "&importantLevel2=" + "-1"
+"&province2="+"-1" + "&province2=" + "-1"
+"&datasource="+"-1" + "&datasource=" + "-1"
+"&provider="+"-1" + "&provider=" + "-1"
+"&xcdcode="+"-1"; + "&xcdcode=" + "-1";
$("#submit2").click(function(){ $("#submit2").click(function () {
$('#suboriginTag').empty(); $('#suboriginTag').empty();
var time2=getStatsPeriodStr(); var time2 = getStatsPeriodStr();
var channel2=getStatsChannelCheckedValues(); var channel2 = getStatsChannelCheckedValues();
var datasource2=getStatsDataSourceCheckedValuesString2(); var datasource2 = getStatsDataSourceCheckedValuesString2();
var warningSource2=getWarningSource3(); var warningSource2 = getWarningSource3();
var importantLevel2=getImportanceLevelCheckedValuesString(); var importantLevel2 = getImportanceLevelCheckedValuesString();
var provider2=getProviderCheckedValues(); var provider2 = getProviderCheckedValues();
var province2=getProvinceCheckedValues(); var province2 = getProvinceCheckedValues();
var code=$.trim(document.getElementById("workingOrderID").value); var code = $.trim(document.getElementById("workingOrderID").value);
// var ifClosed2=getIfClosed(); var report = getReportCheckedValues();
if (code == "") {
if (getStatsChannelCheckedValues().length == 0) {
// $("#time2").val(time2);
// $("#channel3").val(channel2); //给id号为“channel”的html元素赋值,然后在java后台通过getparameter接收元素id为”channel“的value值
// $("#warningSource2").val(warningSource2);
// $("#importantLevel2").val(importantLevel2);
// $("#province2").val(province2);
// $("#ifClosed2").val(ifClosed2);
// var listForm=$("#listForm");
// listForm.attr("action","${ctx}/MonitorOperation/WorkingOrderReasult");
// listForm.submit();
// listForm.attr("method","get");
// $("#PeriodTag3").text($("#time2").val());
//$("#PeriodTag3").text();
if(code==""){
if(getStatsChannelCheckedValues().length==0){
$.alert("渠道的选择不能为空"); $.alert("渠道的选择不能为空");
}else if(getImportanceLevelCheckedValues().length==0){ } else if (getImportanceLevelCheckedValues().length == 0) {
$.alert("告警级别不能为空,请重新选择!"); $.alert("告警级别不能为空,请重新选择!");
}else if(getProviderCheckedValues().length*getProvinceCheckedValues().length==0){ } else if (getProviderCheckedValues().length * getProvinceCheckedValues().length == 0) {
$.alert("省份的选择不能为空"); $.alert("省份的选择不能为空");
} }
else{ else {
toggleMenu('slidePushMenus2');//隐藏筛选项 toggleMenu('slidePushMenus2');//隐藏筛选项
//时间筛选项 //时间筛选项
$('#PeriodTag3').text("时间范围").attr('data-original-title',time2).tooltip(); $('#PeriodTag3').text("时间范围").attr('data-original-title', time2).tooltip();
//渠道刷选项 //渠道刷选项
$("#ChannelTag3").text("渠道").append($("<span class='badge'></span>").text(getStatsChannelCheckedValues().length)).attr('data-original-title',getStatsChannelCheckedTitles()).tooltip(); $("#ChannelTag3").text("渠道").append($("<span class='badge'></span>").text(getStatsChannelCheckedValues().length)).attr('data-original-title', getStatsChannelCheckedTitles()).tooltip();
//告警来源筛选项 //告警来源筛选项
$('#warningSource2').text('告警来源').attr('data-original-title',getWarningSourceName3()).tooltip(); $('#warningSource2').text('告警来源').attr('data-original-title', getWarningSourceName3()).tooltip();
//告警级别标签 //告警级别标签
$('#ImportanceLevelTag').text('级别').append($("<span class='badge'></span>").text(getImportanceLevelCheckedValues().length)).attr('data-original-title',getImportanceLevelCheckedTitles()).tooltip(); $('#ImportanceLevelTag').text('级别').append($("<span class='badge'></span>").text(getImportanceLevelCheckedValues().length)).attr('data-original-title', getImportanceLevelCheckedTitles()).tooltip();
//集成商标签 //集成商标签
$('#ProviderTag').text('集成商') $('#ProviderTag').text('集成商')
.append($("<span class='badge'></span>").text(getProviderCheckedValues().length))//添加数值 .append($("<span class='badge'></span>").text(getProviderCheckedValues().length))//添加数值
.attr('data-original-title',getProviderCheckedTitles()) .attr('data-original-title', getProviderCheckedTitles())
.tooltip(); //修改tooltip值,初始化tooltip .tooltip(); //修改tooltip值,初始化tooltip
//省份标签 //省份标签
$('#ProvinceTag').text('省份').append($("<span class='badge'></span>").text(getProvinceCheckedValues().length)).attr('data-original-title',getProvinceCheckedTitles()).tooltip(); $('#ProvinceTag').text('省份').append($("<span class='badge'></span>").text(getProvinceCheckedValues().length)).attr('data-original-title', getProvinceCheckedTitles()).tooltip();
/* 修改筛选项标签 End*/ /* 修改筛选项标签 End*/
//数据来源标签 //数据来源标签
$('#DataSourceTag').text('数据来源').append($("<span class='badge'></span>").text(getStatsDataSourceCheckedValues().length)).attr('data-original-title',getStatsDataSourceCheckedTitles()).tooltip(); $('#DataSourceTag').text('数据来源').append($("<span class='badge'></span>").text(getStatsDataSourceCheckedValues().length)).attr('data-original-title', getStatsDataSourceCheckedTitles()).tooltip();
reportStr = report;
var reportText='';
if(reportStr === '1'){
reportText='有';
}else if(reportStr === '0'){
reportText='无';
}
if(reportText !==''){
$('#reportsTag').text('分析报告').append($("<span class='badge'></span>").text(1)).attr('data-original-title', reportText).tooltip();
}
var href="${ctx}/MonitorOperation/WorkingOrderReasult/changeTable?channel2="+channel2 var href = "${ctx}/MonitorOperation/WorkingOrderReasult/changeTable?channel2=" + channel2
// +"&time2="+time2 // +"&time2="+time2
+"&warningSource2="+warningSource2 + "&warningSource2=" + warningSource2
+"&importantLevel2="+importantLevel2 + "&importantLevel2=" + importantLevel2
+"&province2="+province2 + "&province2=" + province2
+"&datasource="+datasource2 + "&datasource=" + datasource2
+"&provider="+provider2 + "&provider=" + provider2
+"&xcdcode="+"0"; + "&xcdcode=" + "0"
upLoadExcel="${ctx}/MonitorOperation/WorkingOrderReasult/uploadexcel?channel2="+channel2 + "&report=" + reportStr;
+"&time2="+time2 upLoadExcel = "${ctx}/MonitorOperation/WorkingOrderReasult/uploadexcel?channel2=" + channel2
+"&warningSource2="+warningSource2 + "&time2=" + time2
+"&importantLevel2="+importantLevel2 + "&warningSource2=" + warningSource2
+"&province2="+province2 + "&importantLevel2=" + importantLevel2
+"&datasource="+datasource2 + "&province2=" + province2
+"&provider="+provider2 + "&datasource=" + datasource2
+"&xcdcode="+"0"; + "&provider=" + provider2
+ "&xcdcode=" + "0"
+ "&report=" + reportStr;
$.ajax({ $.ajax({
type : 'GET', type: 'GET',
contentType : 'application/json', contentType: 'application/json',
url: encodeURI(encodeURI(href))+"&time2="+time2, url: encodeURI(encodeURI(href)) + "&time2=" + time2,
dataType : 'text', dataType: 'text',
beforeSend: function(data) { beforeSend: function (data) {
}, },
success: function(data) { success: function (data) {
$("#xcdJsonId").val(data); $("#xcdJsonId").val(data);
xcdFindTable(); xcdFindTable();
...@@ -504,34 +538,36 @@ ...@@ -504,34 +538,36 @@
}); });
} }
$("#xcdcodeid").empty(); $("#xcdcodeid").empty();
}else{ } else {
toggleMenu('slidePushMenus2');//隐藏筛选项 toggleMenu('slidePushMenus2');//隐藏筛选项
var href="${ctx}/MonitorOperation/WorkingOrderReasult/changeTable?channel2="+channel2 var href = "${ctx}/MonitorOperation/WorkingOrderReasult/changeTable?channel2=" + channel2
// +"&time2="+time2 // +"&time2="+time2
+"&warningSource2="+warningSource2 + "&warningSource2=" + warningSource2
+"&importantLevel2="+importantLevel2 + "&importantLevel2=" + importantLevel2
+"&province2="+province2 + "&province2=" + province2
+"&datasource="+datasource2 + "&datasource=" + datasource2
+"&provider="+provider2 + "&provider=" + provider2
+"&xcdcode="+code; + "&xcdcode=" + code
upLoadExcel="${ctx}/MonitorOperation/WorkingOrderReasult/uploadexcel?channel2="+channel2 + "&report=" + reportStr;
+"&time2="+time2 upLoadExcel = "${ctx}/MonitorOperation/WorkingOrderReasult/uploadexcel?channel2=" + channel2
+"&warningSource2="+warningSource2 + "&time2=" + time2
+"&importantLevel2="+importantLevel2 + "&warningSource2=" + warningSource2
+"&province2="+province2 + "&importantLevel2=" + importantLevel2
+"&datasource="+datasource2 + "&province2=" + province2
+"&provider="+provider2 + "&datasource=" + datasource2
+"&xcdcode="+code; + "&provider=" + provider2
+ "&xcdcode=" + code
+ "&report=" + reportStr;
$.ajax({ $.ajax({
type : 'GET', type: 'GET',
contentType : 'application/json', contentType: 'application/json',
url: encodeURI(encodeURI(href))+"&time2="+time2, url: encodeURI(encodeURI(href)) + "&time2=" + time2,
dataType : 'text', dataType: 'text',
beforeSend: function(data) { beforeSend: function (data) {
}, },
success: function(data) { success: function (data) {
$("#xcdJsonId").val(data); $("#xcdJsonId").val(data);
xcdFindTable(); xcdFindTable();
...@@ -543,28 +579,31 @@ ...@@ -543,28 +579,31 @@
}); });
//把协查单列表导出为Excel格式 //把协查单列表导出为Excel格式
$("#upload").click(function(){ $("#upload").click(function () {
// if(xcdlen==0){ // if(xcdlen==0){
// $.alert("协查单查询结果为空,无法导出!"); // $.alert("协查单查询结果为空,无法导出!");
// }else{ // }else{
var listForm=$("#listForm"); var listForm = $("#listForm");
listForm.attr("method","post"); listForm.attr("method", "post");
listForm.attr("action",upLoadExcel); listForm.attr("action", upLoadExcel);
listForm.submit(); listForm.submit();
listForm.attr("action","#"); listForm.attr("action", "#");
// } // }
}); });
}); });
//筛选项页面重置函数 //筛选项页面重置函数
function Reset(){ function Reset() {
initDateStats();//协查单查询页面的是案件初始化 initDateStats();//协查单查询页面的是案件初始化
statsProviderReset();statsProvinceReset();//集成商省份联动重置 statsProviderReset();
statsProvinceReset();//集成商省份联动重置
statsDataSourceReset(); statsDataSourceReset();
importantlevelReset(); importantlevelReset();
reportsReset();
$('#warningSource3')[0].selectedIndex = 0; $('#warningSource3')[0].selectedIndex = 0;
$("#workingOrderID").val(""); $("#workingOrderID").val("");
} }
</script> </script>
</body> </body>
</html> </html>
...@@ -130,23 +130,24 @@ function xcdFindTable(){ ...@@ -130,23 +130,24 @@ function xcdFindTable(){
header[0] = ["","<input type='radio' name='update'id='update' onclick='javascript:radioChoose(this);'/>","1%",""]; header[0] = ["","<input type='radio' name='update'id='update' onclick='javascript:radioChoose(this);'/>","1%",""];
header[1] = ["编号","workingOrderCode","4%",""]; header[1] = ["编号","workingOrderCode","4%",""];
header[2] = ["协查单标题","workingOrderTitle","8%","15"]; header[2] = ["协查单标题","workingOrderTitle","8%","15"];
header[3] = ["协查单描述","workingOrderDescription","10%","18"]; header[3] = ["协查单描述","workingOrderDescription","9%","18"];
header[4] = ["省份","provinceName","4%",""]; header[4] = ["省份","provinceName","4%",""];
// header[5] = ["渠道","channelName","4%",""]; // header[5] = ["渠道","channelName","4%",""];
// header[6] = ["重要级别","importanceLevelName","5%",""]; // header[6] = ["重要级别","importanceLevelName","5%",""];
// header[7] = ["告警来源","warningSourceName","5%",""]; // header[7] = ["告警来源","warningSourceName","5%",""];
header[5] = ["事件发生时间","eventHappenTime","7%",""]; header[5] = ["事件发生时间","eventHappenTime","8%",""];
header[6] = ["业务恢复时间","businessRecoveryTime","7%",""]; header[6] = ["业务恢复时间","businessRecoveryTime","8%",""];
// header[10] = ["事件完成时间","eventCompletionTimeline","10%",""]; // header[10] = ["事件完成时间","eventCompletionTimeline","10%",""];
// header[11] = ["实际完成时间","actualCompletionTime","10%",""]; // header[11] = ["实际完成时间","actualCompletionTime","10%",""];
// header[12] = ["是否关闭","closed","5%",""]; // header[12] = ["是否关闭","closed","5%",""];
// header[13] = ["发生原因","occurReason","10%",""]; // header[13] = ["发生原因","occurReason","10%",""];
// header[14] = ["解决状态","resolvingStatus","10%",""]; // header[14] = ["解决状态","resolvingStatus","10%",""];
header[7]=["事件子来源","suborigin","6%",""]; header[7]=["事件子来源","suborigin","7%",""];
header[8]=["原因类别","woReasonType","5%",""]; header[8]=["原因类别","woReasonType","6%",""];
header[9]=["原因子类一","woReasonSubTypeOne","6%",""]; header[9]=["原因子类一","woReasonSubTypeOne","7%",""];
header[10]=["原因子类二","woReasonSubTypeTwo","6%",""]; header[10]=["原因子类二","woReasonSubTypeTwo","7%",""];
header[11]=["解决方案","proposedResolution","10%","20"]; header[11]=["解决方案","proposedResolution","9%","20"];
header[12]=["分析报告","proposedResolution","9%","20"];
// header[12]=["详细","","4%",""]; // header[12]=["详细","","4%",""];
window.pagging = new table_pagging({limit:12,tableId:'xcdResultTable',header:header}); window.pagging = new table_pagging({limit:12,tableId:'xcdResultTable',header:header});
......
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