Merge remote-tracking branch 'origin/moly'

src/main/java/com/hp/cmsz/repository/ProvinceDao.java

@@ -51,4 +51,7 @@ public interface ProvinceDao extends JpaSpecificationExecutor<Province>,
     //由集成商Ids得到省份信息
     @Query("select province from Province province , ProvinceVersionConfig provinceVersionConfig where provinceVersionConfig.provinceId=province.provinceId and provinceVersionConfig.bossProviderId in (:bossProviderIds) order by province.provinceId")
     List<Province> findProvinceByProviderIds(@Param("bossProviderIds")List<Long> bossProviderIds);
+
+	@Query("select provinceId from Province where provinceName= ?1")
+    public Long findProvinceIdByProvinceName(String provinceName);
 }

src/main/java/com/hp/cmsz/repository/XcdChangeOrderDao.java

@@ -42,5 +42,14 @@ public interface XcdChangeOrderDao extends JpaSpecificationExecutor<XcdChangeOrd
 	
 	//根据告警id得到变更单信息 Add by Charmy
 	@Query(value="select change_order_code , change_order_title , change_start_time, change_end_time from xcd_change_order_info_t cross join (select occur_time,warning_id,cast(parameter_value as number) parameter_value,province_id from gjfx_warning_info_t, dim_system_parameter_info_t where warning_id=:warningID and parameter_name='CHANGE_ORDER_SEARCH_HOURS') gjfx_warning_info_t where (change_start_time>occur_time-parameter_value/24 and change_start_time<occur_time+parameter_value/24 or change_end_time>occur_time-parameter_value/24 and change_end_time<occur_time+parameter_value/24) and gjfx_warning_info_t.province_id=xcd_change_order_info_t.province_id order by change_end_time desc",nativeQuery=true) 
-	List<Object[]> findByWarningId(@Param("warningID")String warningID); 
+	List<Object[]> findByWarningId(@Param("warningID")String warningID);
+
+
+	@Query(value = "select t.* from ccolap.XCD_CHANGE_ORDER_INFO_T t" +
+			" where CHANGE_START_TIME>= ?1 " +
+			" and CHANGE_END_TIME<= ?2 " +
+			"and  PROVINCE_ID = ?3 "
+	,nativeQuery = true)
+	List<XcdChangeOrder> findXcdChangeOrderListByChangeStartTimeAndChangeEndTimeAndProvinceId(
+			Date changeStartTime,Date changeEndTime,Long provinceId);
 }

src/main/java/com/hp/cmsz/repository/XcdDetailInfoViewDao.java

@@ -136,4 +136,7 @@ public interface  XcdDetailInfoViewDao extends PagingAndSortingRepository<XcdDet
 	  List<XcdDetailInfoView> findWorkingOrderIdDistinctByProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndWorkingOrderIdIsNullAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(List<Long> provider,List<Long> datasource,List<Long> channel,List<Long> province);
 	//根据协查单编号查找协查单,协查单明细展示
 	  List <XcdDetailInfoView> findByWorkingOrderCode(String xcdCode);//加List <XcdDetailInfoView>是为了防止数据有问题，例如一个协查单编号对应几条协查单记录，但是在实际环境中一个协查单编号只对应一条记录
+
+
+
 }

src/main/java/com/hp/cmsz/repository/XcdWorkingOrderInfoDao.java

@@ -120,7 +120,16 @@ public interface  XcdWorkingOrderInfoDao extends PagingAndSortingRepository<XcdW
 	@Modifying 
 	@Query(value="delete from XCD_WORKING_ORDER_INFO_T  where WORKING_ORDER_ID = ?1",nativeQuery=true)
 	void deleteByWorkingOrderId(Long xcdId);
-	
+
+
+
+	@Query(value = "select a.* from ccolap.XCD_WORKING_ORDER_INFO_T a ,ccolap.DIM_PROVINCE_INFO_T b " +
+			" where WORKING_ORDER_CODE is not null and EVENT_HAPPEN_TIME>= ?1 " +
+			" and BUSINESS_RECOVERY_TIME<= ?2 " +
+			" and a.prov_code=b.province_code " +
+			" and b.province_id= ?3",nativeQuery = true)
+	List<XcdWorkingOrderInfo> findXcdWorkingOrderInfoByEventHappenTimeAndBusinessRecoveryTimeAndProvinceId(
+			Date eventHappenTime,Date businessRecoveryTime,Long provinceId );
 	
 	
 	

src/main/java/com/hp/cmsz/service/monitoroperation/AssociateDiagosisDetailService.java

@@ -2,6 +2,7 @@ package com.hp.cmsz.service.monitoroperation;
 
 
 import com.hp.cmsz.entity.AssociateDiagosisDetail;
+import com.hp.cmsz.entity.AssociateDiagosisWarningDetail;
 import com.hp.cmsz.entity.XcdWarningInfoView;
 import com.hp.cmsz.repository.DimAssociationAnaInfoDao;
 import com.hp.cmsz.repository.XcdWarningInfoViewDao;
@@ -17,6 +18,7 @@ import javax.persistence.EntityManagerFactory;
 import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -33,30 +35,8 @@ public class AssociateDiagosisDetailService {
 
     @Autowired
     private XcdWarningInfoViewDao xcdWarningInfoViewDao;
-    /*
-   public List<AssociateDiagosisDetail> findLastDiagosisDetail() {
-       SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd:HH:mm:ss");
-       Calendar calendar = Calendar.getInstance();
-       System.out.println(format.format(calendar.getTime()));
-       calendar.add(Calendar.MONTH, -1);
-       System.out.println(format.format(calendar.getTime()));
-
-       List<AssociateDiagosisDetail> list = associateDiagosisDetailDao.findByWarnBeginTimeGreaterThanEqual(new Timestamp(calendar.getTimeInMillis()));
-       System.out.println(list);
-       return null;// associateDiagosisDetailDao.findByWarnBeginTimeGreaterThanEqual(new Timestamp(calendar.getTimeInMillis()));
-
-   }
-
-   public List<AssociateDiagosisDetail> findByBeginToEndTimeAndAssociationTypeAndProvinceId(Timestamp beginTime, Timestamp endTime,
-                                                                                            String type,List<Long> proviceIdList) {
-       return associateDiagosisDetailDao.findByBeginToEndTimeAndAssociationTypeAndProvinceId(beginTime, endTime, type, proviceIdList);
-   }
-
-*/
-    public List<Object[]> findAssociateDiagosisDetailByWarnTimeBeginAndEnd( String warnBeginTime, String warnEndTime){
-        return dimAssociationAnaInfoDao.findAssociateDiagosisDetailByWarnTimeBeginAndEnd(warnBeginTime, warnEndTime);
 
-    }
+
     public List<Object[]> findLastMathAssociateDiagosisDetailByWarnTimeBegin( String warnBeginTime){
         Calendar calendar=Calendar.getInstance();
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -84,13 +64,54 @@ public class AssociateDiagosisDetailService {
         }
 
     }
-    public List<Object[]> findLastMathAssociateDiagosisDetailByWarnTimeBeginAndEndAndDimesionAndProvinceList(String warnBeginTime, String warnEndTime, char dimension, List<Long> provincelist){
-        return dimAssociationAnaInfoDao.findLastMathAssociateDiagosisDetailByWarnTimeBeginAndEndAndDimesionAndProvinceList(warnBeginTime, warnEndTime,dimension,provincelist);
+    public List<AssociateDiagosisDetail> findAssociateDiagosisDetailByWarnTimeBeginAndEnd( String warnBeginTime, String warnEndTime){
+        List<Object[]> list= dimAssociationAnaInfoDao.findAssociateDiagosisDetailByWarnTimeBeginAndEnd(warnBeginTime, warnEndTime);
+        List<AssociateDiagosisDetail>diagosisDetails=new ArrayList<AssociateDiagosisDetail>();
+        if(null!=list){
+            for (Object[] objects : list) {
+                AssociateDiagosisDetail detail=new AssociateDiagosisDetail();
+                detail.setAssociationId((BigInteger)objects[0]);
+                detail.setProvinceId((BigInteger)objects[1]);
+                detail.setAssociationType(objects[2].toString().toCharArray()[0]);
+                detail.setAssociationDesc((String)objects[3]);
+                detail.setProvinceName((String)objects[4]);
+                detail.setWarnBeginTime((Timestamp)objects[5]);
+                detail.setWarnEndTime((Timestamp)objects[6]);
+                detail.setWarningNum((BigInteger)objects[7]);
+                diagosisDetails.add(detail);
+            }
+
+        }
+        return diagosisDetails;
+
+
+//        return dimAssociationAnaInfoDao.findAssociateDiagosisDetailByWarnTimeBeginAndEnd(warnBeginTime, warnEndTime);
+
+    }
+    public List<AssociateDiagosisDetail> findLastMathAssociateDiagosisDetailByWarnTimeBeginAndEndAndDimesionAndProvinceList(String warnBeginTime, String warnEndTime, char dimension, List<Long> provincelist){
+
+        List<Object[]> list=dimAssociationAnaInfoDao.findLastMathAssociateDiagosisDetailByWarnTimeBeginAndEndAndDimesionAndProvinceList(warnBeginTime, warnEndTime,dimension,provincelist);
+        List<AssociateDiagosisDetail>diagosisDetails=new ArrayList<AssociateDiagosisDetail>();
+        if(null!=list){
+            for (Object[] objects : list) {
+                AssociateDiagosisDetail detail=new AssociateDiagosisDetail();
+                detail.setAssociationId((BigInteger)objects[0]);
+                detail.setProvinceId((BigInteger)objects[1]);
+                detail.setAssociationType(objects[2].toString().toCharArray()[0]);
+                detail.setAssociationDesc((String)objects[3]);
+                detail.setProvinceName((String)objects[4]);
+                detail.setWarnBeginTime((Timestamp)objects[5]);
+                detail.setWarnEndTime((Timestamp)objects[6]);
+                detail.setWarningNum((BigInteger)objects[7]);
+                diagosisDetails.add(detail);
+            }
+
+        }
+        return diagosisDetails;
+
+//        return dimAssociationAnaInfoDao.findLastMathAssociateDiagosisDetailByWarnTimeBeginAndEndAndDimesionAndProvinceList(warnBeginTime, warnEndTime,dimension,provincelist);
     }
 
-//    public Object[] findDetailByAssociationIdAndWarnBeginToEndTime(String beginTime,String endTime,Long associationId){
-//        return dimAssociationAnaInfoDao.findDetailByAssociationIdAndWarnBeginToEndTime(beginTime,endTime,associationId);
-//    }
 
 
     public List<Object[]> findByWarningListDetail(String beginTime,String endTime,Long associationId){
@@ -110,5 +131,55 @@ public class AssociateDiagosisDetailService {
         return null;
     }
 
+    public List<AssociateDiagosisWarningDetail>findDetailByBeginTimeAndEndTimeAndAssociationIdAndProvinceId(String beginTime,String endTime,
+                                                                                    Long associationId,Long provinceId){
+        List<Object[]>list= dimAssociationAnaInfoDao.findDetailByBeginTimeAndEndTimeAndAssociationIdAndProvinceId(beginTime, endTime, associationId, provinceId);
+        List<AssociateDiagosisWarningDetail> adwdl = new ArrayList<AssociateDiagosisWarningDetail>();
+        if(list!=null&&list.size()>0){
+            if(list !=null){
+                for (Object[] objects : list) {
+                    AssociateDiagosisWarningDetail adwd = new AssociateDiagosisWarningDetail();
+                    adwd.setASSOCIATION_ID(String.valueOf(objects[0]) );
+                    adwd.setASSOCIATION_TYPE(objects[2]+"");
+                    adwd.setASSOCIATION_DESC(objects[3]+"");
+                    adwd.setPROVINCE_NAME( objects[4]+"");
+                    adwd.setPROVINCE_ID( objects[1]+"");
+                    adwd.setKPI_CODE(objects[7]+"");
+                    adwd.setKPI_NAME(objects[8]+"");
+                    adwd.setKPI_ID(String.valueOf(objects[9]));
+                    adwd.setKPI_WEIGHT(String.valueOf(objects[10]));
+                    adwd.setWARNING_NUM(String.valueOf( objects[11]));
+                    adwd.setINFLUENCE_LEVEL(String.valueOf( objects[12]));
+                    adwdl.add(adwd);
+                }
+            }
+        }
+        return adwdl;
+    }
+
+    public List<AssociateDiagosisDetail> findDetailByProvinceIdAndoccurTimeAndCloseTime( Long provinceId,
+                                                                       String occurTime,
+                                                                       String closeTime){
+        List<Object[]>list= dimAssociationAnaInfoDao.findObjByProvinceIdAndoccurTimeAndCloseTime(provinceId, occurTime, closeTime);
+        List<AssociateDiagosisDetail> associateDiagosisDetails = new ArrayList<AssociateDiagosisDetail>();
+        if(list!=null&&list.size()>0){
+            for (Object[] objects : list) {
+                AssociateDiagosisDetail detail=new AssociateDiagosisDetail();
+                detail.setAssociationId((BigInteger)objects[0]);
+                detail.setProvinceId((BigInteger)objects[1]);
+                detail.setAssociationType(objects[2].toString().toCharArray()[0]);
+                detail.setAssociationDesc((String)objects[3]);
+                detail.setProvinceName((String)objects[4]);
+                detail.setWarnBeginTime((Timestamp)objects[5]);
+                detail.setWarnEndTime((Timestamp)objects[6]);
+                detail.setWarningNum((BigInteger)objects[7]);
+                associateDiagosisDetails.add(detail);
+            }
+
+        }
+        return associateDiagosisDetails;
+
+    }
+
 
 }

src/main/webapp/WEB-INF/tags/GZFX__Dimension_Province_detail_associateDiagosisDetail.tag

@@ -24,7 +24,7 @@
         <label for="">关联维度：</label>
         <select name="xcdStatus" id="xcdStatusSelect" class="slide-menu-select" onChange="judge=false;">
             <option value="c">业务</option>
-            <option value="q" selected>渠道</option>
+            <option value="y" selected>渠道</option>
             <%--<c:forEach var="workingOrderStatus" items="${workingOrderStatusList}">
                 <option value="${workingOrderStatus}" id="xcdStatus">
                         ${workingOrderStatus}

src/main/webapp/WEB-INF/views/MonitorOperation/WarnAnalysisDetail.jsp

@@ -242,6 +242,7 @@ th{
 				dataType : 'text',
 				beforeSend: function(data) {},
 				success: function(data) {
+
 		            $("#wadt").val(data);
 		            warnAnalysisDetailTable();
 					toggleMenu('slidePushMenus2');//隐藏筛选项