过滤规则维护

.idea/workspace.xml

@@ -7,7 +7,46 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CmszMonitorAnalysis.war" afterPath="$PROJECT_DIR$/CmszMonitorAnalysis.war" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/DimAssociationAnaInfo.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/DimAssociationAnaInfo.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/DimKpi.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/DimKpi.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/DimKpiAssociationRelInfo.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/DimKpiAssociationRelInfo.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/FilterRule.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/FilterRule.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/Kpi.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/Kpi.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/QualityRule.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/QualityRule.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/AccuracyRuleDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/AccuracyRuleDao.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/BusinessDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/BusinessDao.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/ChannelDataSourceMapDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/ChannelDataSourceMapDao.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/DimAssociationAnaInfoDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/DimAssociationAnaInfoDao.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/DimKpiAssociationRelInfoDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/DimKpiAssociationRelInfoDao.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/DimKpiDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/DimKpiDao.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/FilterRuleDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/FilterRuleDao.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/KpiDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/KpiDao.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/QualityRuleDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/QualityRuleDao.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/service/analysissupport/AccuracyRuleService.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/service/analysissupport/AccuracyRuleService.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/service/analysissupport/FilterRuleService.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/service/analysissupport/FilterRuleService.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/service/analysissupport/QualityRuleService.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/service/analysissupport/QualityRuleService.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/service/monitoroperation/AssociateDiagosisConfigurationService.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/service/monitoroperation/AssociateDiagosisConfigurationService.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/PageURLController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/PageURLController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/analysissupport/FilterRuleMaintainController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/analysissupport/FilterRuleMaintainController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/analysissupport/FilterRuleResultController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/analysissupport/FilterRuleResultController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/analysissupport/QualityRuleResultController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/analysissupport/QualityRuleResultController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/commonmanage/TaskManageController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/commonmanage/TaskManageController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/modelmanage/ModelMaintainController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/modelmanage/ModelMaintainController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/monitoroperation/AssociateDiagosisConfigurationController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/monitoroperation/AssociateDiagosisConfigurationController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/monitoroperation/FailureStatisticsCriteriaController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/monitoroperation/FailureStatisticsCriteriaController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ChannelDataSourceMapDao.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ChannelDataSourceMapDao.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/modelmanage/ModelMaintainController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/modelmanage/ModelMaintainController.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/filterResultDetailTable.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/filterResultDetailTable.js" />
     </list>
     <ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -23,68 +62,65 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="FilterRuleResult.jsp" pinned="false" current-in-tab="true">
+      <file leaf-file-name="FilterRuleResult.jsp" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="327">
-              <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
+            <state relative-caret-position="1152">
+              <caret line="48" column="68" lean-forward="false" selection-start-line="48" selection-start-column="68" selection-end-line="48" selection-end-column="68" />
               <folding>
-                <element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
+                <element signature="n#c:forEach#0;n#jsp:root#0;n#!!top" expanded="false" />
+                <element signature="n#c:forEach#1;n#jsp:root#0;n#!!top" expanded="false" />
                 <element signature="n#c:forEach#2;n#jsp:root#0;n#!!top" expanded="false" />
-                <element signature="n#c:forEach#3;n#jsp:root#0;n#!!top" expanded="false" />
-                <element signature="n#c:forEach#4;n#jsp:root#0;n#!!top" expanded="false" />
-                <element signature="n#c:forEach#7;n#jsp:root#0;n#!!top" expanded="false" />
-                <element signature="e#7049#7111#0#HTML" expanded="false" />
-                <element signature="e#7203#7262#0#HTML" expanded="false" />
-                <element signature="e#7353#7793#0#HTML" expanded="false" />
-                <element signature="e#7841#8348#0#HTML" expanded="false" />
-                <element signature="e#8399#9075#0#HTML" expanded="false" />
-                <element signature="e#9408#9470#0#HTML" expanded="false" />
-                <element signature="e#9562#9621#0#HTML" expanded="false" />
-                <element signature="e#9712#10152#0#HTML" expanded="false" />
-                <element signature="e#10727#10956#0#HTML" expanded="false" />
-                <element signature="e#10997#11285#0#HTML" expanded="false" />
-                <element signature="e#11326#11607#0#HTML" expanded="false" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="FilterRuleResultController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleResultController.java">
+      <file leaf-file-name="ModelResultController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelResultController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="128">
-              <caret line="70" column="67" lean-forward="true" selection-start-line="70" selection-start-column="43" selection-end-line="70" selection-end-column="67" />
+            <state relative-caret-position="336">
+              <caret line="61" column="13" lean-forward="false" selection-start-line="61" selection-start-column="13" selection-end-line="61" selection-end-column="13" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="KpiDao.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java">
+      <file leaf-file-name="ModelMonitorController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMonitorController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="45">
-              <caret line="31" column="34" lean-forward="false" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="34" />
+            <state relative-caret-position="312">
+              <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Kpi.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Kpi.java">
+      <file leaf-file-name="ModelMaintainController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="207">
-              <caret line="36" column="26" lean-forward="false" selection-start-line="36" selection-start-column="19" selection-end-line="36" selection-end-column="26" />
+            <state relative-caret-position="696">
+              <caret line="73" column="4" lean-forward="false" selection-start-line="73" selection-start-column="4" selection-end-line="74" selection-end-column="50" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="DataSource.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataSource.java">
+      <file leaf-file-name="TaskManageController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="255">
-              <caret line="22" column="29" lean-forward="false" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="29" />
+            <state relative-caret-position="8856">
+              <caret line="395" column="24" lean-forward="false" selection-start-line="395" selection-start-column="24" selection-end-line="395" selection-end-column="24" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="dataSource_channel_business_kpi.tag" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/dataSource_channel_business_kpi.tag">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="286">
+              <caret line="466" column="21" lean-forward="true" selection-start-line="466" selection-start-column="21" selection-end-line="466" selection-end-column="21" />
               <folding />
             </state>
           </provider>
@@ -103,19 +139,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>.APP_EWARNING_CALC_RESULT_T</find>
-      <find>dataModelParameterList</find>
-      <find>\n</find>
-      <find>submitForm</find>
-      <find>addTr</find>
-      <find>AnalysisSupport/QualityRuleResult</find>
-      <find>findAccuracy</find>
-      <find>ruleSubmit</find>
-      <find>form-control</find>
-      <find>alert</find>
-      <find>ifRepeate</find>
-      <find>ruleMaintainForm</find>
-      <find>dataSource</find>
       <find>kpiinput</find>
       <find>ajax</find>
       <find>submit</find>
@@ -133,10 +156,24 @@
       <find>getBusiness</find>
       <find>showBusiness</find>
       <find>'Y'</find>
+      <find>allBusinessStats</find>
+      <find>kp</find>
+      <find>business</find>
+      <find>三</find>
+      <find>findKpiByBusinessIds</find>
+      <find>statsChannelChange</find>
+      <find>businessSelectAreaStats</find>
+      <find>ruleBack</find>
+      <find>ruleId</find>
+      <find>dataSourceName</find>
+      <find>dataSourceList</find>
+      <find>fm</find>
+      <find>ftpFileInput</find>
     </findStrings>
     <replaceStrings>
       <replace>InsideXcdWorkingOrderInfoView</replace>
       <replace>alertMsg</replace>
+      <replace>Kpi</replace>
     </replaceStrings>
   </component>
   <component name="Git.Settings">
@@ -156,11 +193,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoViewService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoViewDao.java" />
-        <option value="$PROJECT_DIR$/build.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdChangeOrderDao.java" />
         <option value="$PROJECT_DIR$/src/main/webapp/static/js/insideXcdWarningTable.js" />
         <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java" />
         <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp" />
@@ -189,23 +221,28 @@
         <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/commonmanage/EWarningCalcResultDao.java" />
         <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp" />
         <option value="$PROJECT_DIR$/src/main/webapp/static/js/validation.js" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java" />
         <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java" />
         <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp" />
         <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/FilterRuleDao.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/FilterRuleService.java" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp" />
         <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/ProvinceTag.tag" />
         <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FilterRule.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/BusinessDao.java" />
-        <option value="$PROJECT_DIR$/src/main/webapp/static/js/filterResultDetailTable.js" />
         <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/ChannelTag.tag" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleMaintainController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/BusinessDao.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/GJFX_datasource_channle_business.tag" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Kpi.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/dataSource_channel_business_kpi.tag" />
         <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FailureStatisticsCriteriaController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/FilterRuleDao.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleResultController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleMaintainController.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/static/js/filterResultDetailTable.js" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java" />
         <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp" />
       </list>
     </option>
@@ -251,12 +288,15 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="191" />
-    <option name="y" value="-12" />
+    <option name="x" value="-43" />
+    <option name="y" value="-10" />
     <option name="width" value="1380" />
     <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectReloadState">
+    <option name="STATE" value="2" />
+  </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
       <flattenPackages />
@@ -272,9 +312,9 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="Scratches" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -282,11 +322,56 @@
               <item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
               <item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
+              <item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
+              <item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
+              <item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
+              <item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
+              <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
+              <item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
+              <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
+              <item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
+              <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
+              <item name="views" type="462c0819:PsiDirectoryNode" />
+              <item name="MonitorOperation" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -298,7 +383,7 @@
     <property name="last_opened_file_path" value="$PROJECT_DIR$/lib/servlet-api.jar!/" />
     <property name="settings.editor.selected.configurable" value="vcs.Git" />
     <property name="ignore_missing_gitignore" value="true" />
-    <property name="SearchEverywhereHistoryKey" value="POST&#9;FILE&#9;jar://E:/Code/monitorAnalysis/src/main/webapp/WEB-INF/lib/batik-svggen-1.7.jar!/org/apache/batik/svggen/font/table/PostTable.class&#10;serialize&#9;PSI&#9;JAVA://org.elasticsearch.common.collect.ImmutableAsList.SerializedForm&#10;afe&#9;PSI&#9;JAVA://org.apache.fop.afp.AFPEventProducer&#10;hea&#9;FILE&#9;file://D:/代码/智能分析平台/CmszMonitorAnalysis/trunk/src/main/webapp/WEB-INF/layouts/header.jsp" />
+    <property name="SearchEverywhereHistoryKey" value="FailureStatisticsCriteria&#9;PSI&#9;JAVA://com.hp.cmsz.web.monitoroperation.FailureStatisticsCriteriaController&#10;POST&#9;FILE&#9;jar://E:/Code/monitorAnalysis/src/main/webapp/WEB-INF/lib/batik-svggen-1.7.jar!/org/apache/batik/svggen/font/table/PostTable.class&#10;serialize&#9;PSI&#9;JAVA://org.elasticsearch.common.collect.ImmutableAsList.SerializedForm&#10;afe&#9;PSI&#9;JAVA://org.apache.fop.afp.AFPEventProducer&#10;hea&#9;FILE&#9;file://D:/代码/智能分析平台/CmszMonitorAnalysis/trunk/src/main/webapp/WEB-INF/layouts/header.jsp" />
     <property name="jsx.switch.disabled" value="true" />
   </component>
   <component name="RecentsManager">
@@ -548,7 +633,10 @@
       <workItem from="1512188402032" duration="982000" />
       <workItem from="1512189513405" duration="1759000" />
       <workItem from="1512192653380" duration="2572000" />
-      <workItem from="1512205059832" duration="47415000" />
+      <workItem from="1512205059832" duration="47509000" />
+      <workItem from="1512309086325" duration="17028000" />
+      <workItem from="1512372353873" duration="5810000" />
+      <workItem from="1512385594143" duration="148000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1507828551888</created>
@@ -648,11 +736,39 @@
       <option name="project" value="LOCAL" />
       <updated>1512306987236</updated>
     </task>
-    <option name="localTasksCounter" value="15" />
+    <task id="LOCAL-00015" summary="过滤规则维护页面编写">
+      <created>1512307237992</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1512307237992</updated>
+    </task>
+    <task id="LOCAL-00016" summary="合并刘娜代码">
+      <created>1512309114275</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1512309114275</updated>
+    </task>
+    <task id="LOCAL-00017" summary="合并刘娜代码">
+      <created>1512353747577</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1512353747577</updated>
+    </task>
+    <task id="LOCAL-00018" summary="过滤规则维护">
+      <created>1512367356053</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1512367356054</updated>
+    </task>
+    <option name="localTasksCounter" value="19" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="348401000" />
+    <option name="totallyTimeSpent" value="371511000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -674,20 +790,19 @@
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24963397" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4398148" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.67746913" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32837838" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31790122" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
+      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3271605" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6373457" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.53858024" sideWeight="0.4939394" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27314815" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2677761" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27155825" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
@@ -698,6 +813,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="IvyIDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31790122" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
@@ -795,7 +911,9 @@
     <MESSAGE value="Merge remote-tracking branch 'monitorAnalysis/liuna'&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ChannelDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/BusinessService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$1.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$2.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$3.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$4.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class" />
     <MESSAGE value="把servlet-api包放到默认lib下" />
     <MESSAGE value="过滤规则维护页面编写" />
-    <option name="LAST_COMMIT_MESSAGE" value="过滤规则维护页面编写" />
+    <MESSAGE value="合并刘娜代码" />
+    <MESSAGE value="过滤规则维护" />
+    <option name="LAST_COMMIT_MESSAGE" value="过滤规则维护" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -807,7 +925,7 @@
           <option name="timeStamp" value="17" />
         </line-breakpoint>
       </breakpoints>
-      <option name="time" value="53" />
+      <option name="time" value="59" />
     </breakpoint-manager>
     <watches-manager>
       <configuration name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory">
@@ -828,111 +946,10 @@
     </buildFile>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2032">
-          <caret line="83" column="19" lean-forward="false" selection-start-line="83" selection-start-column="14" selection-end-line="83" selection-end-column="19" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="121" column="64" lean-forward="true" selection-start-line="121" selection-start-column="37" selection-end-line="121" selection-end-column="64" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/PzxAnalysisController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-9">
-          <caret line="71" column="13" lean-forward="false" selection-start-line="71" selection-start-column="13" selection-end-line="71" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleConfiguration.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="442" column="72" lean-forward="false" selection-start-line="442" selection-start-column="64" selection-end-line="442" selection-end-column="72" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="119" column="91" lean-forward="false" selection-start-line="119" selection-start-column="84" selection-end-line="119" selection-end-column="91" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/kpiTagController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-729">
-          <caret line="36" column="13" lean-forward="false" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="275" column="43" lean-forward="true" selection-start-line="275" selection-start-column="43" selection-end-line="275" selection-end-column="43" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="123" column="0" lean-forward="false" selection-start-line="123" selection-start-column="0" selection-end-line="123" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/JpfxAnalysisController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1692">
-          <caret line="66" column="13" lean-forward="false" selection-start-line="66" selection-start-column="13" selection-end-line="66" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderDetail.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-9864">
-          <caret line="87" column="62" lean-forward="true" selection-start-line="87" selection-start-column="62" selection-end-line="87" selection-end-column="62" />
-          <folding>
-            <marker date="1512188374539" expanded="true" signature="24226:24239" ph="..." />
-            <marker date="1512188374539" expanded="true" signature="26170:26183" ph="..." />
-            <marker date="1512188374539" expanded="true" signature="30315:30373" ph="..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/jquery-1.7.2.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="7201" column="13" lean-forward="false" selection-start-line="7201" selection-start-column="4" selection-end-line="7201" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/elasticsearch-1.0.0.jar!/org/elasticsearch/common/collect/ImmutableAsList.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="464">
-          <caret line="35" column="1" lean-forward="true" selection-start-line="35" selection-start-column="1" selection-end-line="35" selection-end-column="1" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/jquery-1.9.1.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="199">
           <caret line="7302" column="4" lean-forward="false" selection-start-line="7302" selection-start-column="4" selection-end-line="7302" selection-end-column="4" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -940,7 +957,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
           <caret line="7" column="57" lean-forward="true" selection-start-line="7" selection-start-column="57" selection-end-line="7" selection-end-column="57" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -948,18 +964,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-33">
           <caret line="2656" column="24" lean-forward="true" selection-start-line="2656" selection-start-column="24" selection-end-line="2656" selection-end-column="24" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2403">
-          <caret line="838" column="49" lean-forward="false" selection-start-line="838" selection-start-column="45" selection-end-line="838" selection-end-column="49" />
-          <folding>
-            <marker date="1512188374539" expanded="true" signature="47293:47349" ph="..." />
-            <marker date="1512188374539" expanded="true" signature="47572:47583" ph="..." />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -967,7 +971,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="303">
           <caret line="209" column="64" lean-forward="true" selection-start-line="209" selection-start-column="16" selection-end-line="209" selection-end-column="64" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -975,7 +978,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="159">
           <caret line="91" column="45" lean-forward="true" selection-start-line="91" selection-start-column="45" selection-end-line="95" selection-end-column="64" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -991,7 +993,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="392">
           <caret line="32" column="5" lean-forward="false" selection-start-line="32" selection-start-column="5" selection-end-line="32" selection-end-column="5" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -999,15 +1000,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="207">
           <caret line="22" column="37" lean-forward="false" selection-start-line="22" selection-start-column="37" selection-end-line="22" selection-end-column="37" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/FilterRuleDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="14" column="41" lean-forward="false" selection-start-line="14" selection-start-column="41" selection-end-line="14" selection-end-column="41" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1015,7 +1007,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="111">
           <caret line="219" column="43" lean-forward="false" selection-start-line="219" selection-start-column="43" selection-end-line="219" selection-end-column="43" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1023,7 +1014,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="296">
           <caret line="21" column="57" lean-forward="false" selection-start-line="21" selection-start-column="57" selection-end-line="21" selection-end-column="57" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1031,7 +1021,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-712">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1039,7 +1028,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-72">
           <caret line="117" column="34" lean-forward="false" selection-start-line="117" selection-start-column="24" selection-end-line="117" selection-end-column="34" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1047,9 +1035,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="22">
           <caret line="16" column="32" lean-forward="true" selection-start-line="16" selection-start-column="32" selection-end-line="16" selection-end-column="32" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1057,7 +1042,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="112">
           <caret line="191" column="25" lean-forward="false" selection-start-line="191" selection-start-column="25" selection-end-line="191" selection-end-column="25" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1075,7 +1059,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="217">
           <caret line="48" column="47" lean-forward="true" selection-start-line="48" selection-start-column="27" selection-end-line="48" selection-end-column="47" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1083,15 +1066,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1960">
           <caret line="75" column="5" lean-forward="true" selection-start-line="75" selection-start-column="5" selection-end-line="75" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="199" column="7" lean-forward="true" selection-start-line="199" selection-start-column="7" selection-end-line="200" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1099,17 +1073,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="207">
           <caret line="23" column="45" lean-forward="false" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="45" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FilterRule.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="20" column="22" lean-forward="false" selection-start-line="20" selection-start-column="17" selection-end-line="20" selection-end-column="22" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1117,15 +1080,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-504">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/BusinessDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="72">
-          <caret line="17" column="38" lean-forward="true" selection-start-line="17" selection-start-column="38" selection-end-line="17" selection-end-column="38" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1133,7 +1087,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="207">
           <caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1141,7 +1094,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="279">
           <caret line="23" column="39" lean-forward="false" selection-start-line="23" selection-start-column="17" selection-end-line="23" selection-end-column="39" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1149,134 +1101,251 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="303">
           <caret line="23" column="29" lean-forward="false" selection-start-line="23" selection-start-column="17" selection-end-line="23" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/ChannelTag.tag">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="576">
+          <caret line="24" column="48" lean-forward="true" selection-start-line="24" selection-start-column="48" selection-end-line="24" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataSource.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="360">
+          <caret line="22" column="29" lean-forward="false" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/filterResultDetailTable.js">
+    <entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/spring-data-commons-1.5.1.RELEASE.jar!/org/springframework/data/repository/CrudRepository.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2727">
-          <caret line="303" column="37" lean-forward="true" selection-start-line="303" selection-start-column="37" selection-end-line="303" selection-end-column="37" />
+        <state relative-caret-position="207">
+          <caret line="16" column="26" lean-forward="false" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleMaintainController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="279">
+          <caret line="74" column="20" lean-forward="true" selection-start-line="74" selection-start-column="20" selection-end-line="74" selection-end-column="20" />
           <folding>
-            <element signature="e#9420#9542#0" expanded="false" />
-            <element signature="e#9588#9710#0" expanded="false" />
-            <element signature="e#9756#9871#0" expanded="false" />
-            <marker date="1512299889531" expanded="true" signature="10872:10884" ph="..." />
-            <marker date="1512299889531" expanded="true" signature="17460:17470" ph="..." />
+            <element signature="e#3339#3351#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/ChannelTag.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/BusinessDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="480">
+          <caret line="28" column="28" lean-forward="false" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/GJFX_datasource_channle_business.tag">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1005">
+          <caret line="394" column="0" lean-forward="false" selection-start-line="394" selection-start-column="0" selection-end-line="394" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Kpi.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="576">
-          <caret line="24" column="48" lean-forward="true" selection-start-line="24" selection-start-column="48" selection-end-line="24" selection-end-column="48" />
+          <caret line="37" column="27" lean-forward="false" selection-start-line="37" selection-start-column="17" selection-end-line="37" selection-end-column="27" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/GJFX_datasource_channle_business.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-531">
+          <caret line="53" column="45" lean-forward="true" selection-start-line="53" selection-start-column="8" selection-end-line="53" selection-end-column="45" />
+          <folding>
+            <marker date="1512188374539" expanded="true" signature="47293:47349" ph="..." />
+            <marker date="1512188374539" expanded="true" signature="47572:47583" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/ServiceFeatureAnalysis.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-6552">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-576">
+        <state relative-caret-position="189">
+          <caret line="381" column="0" lean-forward="false" selection-start-line="381" selection-start-column="0" selection-end-line="383" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="32" column="0" lean-forward="true" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FailureStatisticsCriteriaController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="147" column="0" lean-forward="true" selection-start-line="147" selection-start-column="0" selection-end-line="147" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/GJFX_StatDimTag.tag">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/TSWB_Detail_Period.tag">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="19" selection-end-column="6" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataSource.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/ProvinceTag.tag">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="22" column="29" lean-forward="false" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="29" />
+        <state relative-caret-position="120">
+          <caret line="5" column="29" lean-forward="true" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Kpi.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/GZFX_Period_detail.tag">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="36" column="26" lean-forward="false" selection-start-line="36" selection-start-column="19" selection-end-line="36" selection-end-column="26" />
+        <state relative-caret-position="2712">
+          <caret line="113" column="34" lean-forward="false" selection-start-line="112" selection-start-column="12" selection-end-line="113" selection-end-column="34" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/spring-data-commons-1.5.1.RELEASE.jar!/org/springframework/data/repository/CrudRepository.class">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="16" column="26" lean-forward="false" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
+        <state relative-caret-position="264">
+          <caret line="188" column="35" lean-forward="true" selection-start-line="183" selection-start-column="19" selection-end-line="188" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FilterRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="96">
+          <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="260" column="40" lean-forward="false" selection-start-line="260" selection-start-column="34" selection-end-line="260" selection-end-column="40" />
-          <folding>
-            <marker date="1512290362111" expanded="true" signature="6242:6252" ph="..." />
-            <marker date="1512290362111" expanded="true" signature="12598:12608" ph="..." />
-          </folding>
+        <state relative-caret-position="-1953">
+          <caret line="38" column="13" lean-forward="false" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="13" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleMaintainController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleResultController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="279">
-          <caret line="74" column="20" lean-forward="true" selection-start-line="74" selection-start-column="20" selection-end-line="74" selection-end-column="20" />
+        <state relative-caret-position="1776">
+          <caret line="95" column="33" lean-forward="false" selection-start-line="95" selection-start-column="19" selection-end-line="95" selection-end-column="33" />
           <folding>
-            <element signature="e#3339#3351#0" expanded="true" />
+            <element signature="e#3083#3089#0" expanded="false" />
+            <element signature="e#3135#3141#0" expanded="false" />
+            <element signature="e#3189#3197#0" expanded="false" />
+            <element signature="e#3322#3328#0" expanded="false" />
+            <element signature="e#3633#3639#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/ProvinceTag.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/filterResultDetailTable.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="8" column="81" lean-forward="false" selection-start-line="8" selection-start-column="73" selection-end-line="8" selection-end-column="81" />
-          <folding />
+        <state relative-caret-position="10656">
+          <caret line="450" column="28" lean-forward="false" selection-start-line="450" selection-start-column="28" selection-end-line="450" selection-end-column="28" />
+          <folding>
+            <element signature="e#9407#9529#0" expanded="false" />
+            <element signature="e#9575#9697#0" expanded="false" />
+            <element signature="e#9743#9858#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="31" column="34" lean-forward="false" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="34" />
+        <state relative-caret-position="240">
+          <caret line="154" column="45" lean-forward="false" selection-start-line="154" selection-start-column="45" selection-end-line="154" selection-end-column="45" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleResultController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/FilterRuleDao.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="70" column="67" lean-forward="true" selection-start-line="70" selection-start-column="43" selection-end-line="70" selection-end-column="67" />
+        <state relative-caret-position="360">
+          <caret line="20" column="109" lean-forward="false" selection-start-line="20" selection-start-column="109" selection-end-line="20" selection-end-column="109" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="258" column="9" lean-forward="true" selection-start-line="258" selection-start-column="9" selection-end-line="258" selection-end-column="9" />
+        <state relative-caret-position="1152">
+          <caret line="48" column="68" lean-forward="false" selection-start-line="48" selection-start-column="68" selection-end-line="48" selection-end-column="68" />
           <folding>
-            <element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="false" />
+            <element signature="n#c:forEach#0;n#jsp:root#0;n#!!top" expanded="false" />
+            <element signature="n#c:forEach#1;n#jsp:root#0;n#!!top" expanded="false" />
             <element signature="n#c:forEach#2;n#jsp:root#0;n#!!top" expanded="false" />
-            <element signature="n#c:forEach#3;n#jsp:root#0;n#!!top" expanded="false" />
-            <element signature="n#c:forEach#4;n#jsp:root#0;n#!!top" expanded="false" />
-            <element signature="n#c:forEach#7;n#jsp:root#0;n#!!top" expanded="false" />
-            <element signature="e#7049#7111#0#HTML" expanded="false" />
-            <element signature="e#7203#7262#0#HTML" expanded="false" />
-            <element signature="e#7353#7793#0#HTML" expanded="false" />
-            <element signature="e#7841#8348#0#HTML" expanded="false" />
-            <element signature="e#8399#9075#0#HTML" expanded="false" />
-            <element signature="e#9408#9470#0#HTML" expanded="false" />
-            <element signature="e#9562#9621#0#HTML" expanded="false" />
-            <element signature="e#9712#10152#0#HTML" expanded="false" />
-            <element signature="e#10727#10956#0#HTML" expanded="false" />
-            <element signature="e#10997#11285#0#HTML" expanded="false" />
-            <element signature="e#11326#11607#0#HTML" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelResultController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="336">
+          <caret line="61" column="13" lean-forward="false" selection-start-line="61" selection-start-column="13" selection-end-line="61" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMonitorController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="312">
+          <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="696">
+          <caret line="73" column="4" lean-forward="false" selection-start-line="73" selection-start-column="4" selection-end-line="74" selection-end-column="50" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="8856">
+          <caret line="395" column="24" lean-forward="false" selection-start-line="395" selection-start-column="24" selection-end-line="395" selection-end-column="24" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/dataSource_channel_business_kpi.tag">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="286">
+          <caret line="466" column="21" lean-forward="true" selection-start-line="466" selection-start-column="21" selection-end-line="466" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java

@@ -66,7 +66,8 @@ public class TaskManageController {
     @Autowired
     private EWarningCalcResultDao eWarningCalcResultDao;
 
-
+    @Autowired
+    private SystemParameterDao systemParameterDao;
 
 
     @RequestMapping(value = "/taskHome")
@@ -333,9 +334,10 @@ public class TaskManageController {
     @ResponseBody
     public APPEWarningDetail ModelPreview(String id){
         APPEWarningDetail app =null;
+        String modelSavePath = systemParameterDao.findByParameterName("MODEL_SCRIPT_FILE_DIR").get(0).getParameterValue();
 
         RunTask rt = runTaskService.getRunTask(Long.parseLong(id));
-        String path = "/home/dsadm/ETL/test/"+rt.getDataModelView().getModelScriptName()+" "+id;
+        String path =modelSavePath+rt.getDataModelView().getModelScriptName()+" "+id;
 //        String path ="d:\\rscript\\a.r";
         try {
             Runtime run = Runtime.getRuntime();// 返回与当前 Java 应用程序相关的运行时对象
@@ -375,8 +377,10 @@ public class TaskManageController {
     };
     @RequestMapping(value = "/modelPreviewImg")
     public void ModelPreview(HttpServletResponse response,String path){
-        System.out.println("fileName:"+path);
-        File file = new File("/home/dsadm/ETL/test/"+path);
+//        System.out.println("fileName:"+path);
+        String modelSavePath = systemParameterDao.findByParameterName("MODEL_SCRIPT_FILE_DIR").get(0).getParameterValue();
+
+        File file = new File(modelSavePath+"img"+path);
 //        File file = new File("d:\\rscript\\al.jpg");
         FileInputStream fis;
         try {

src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java

@@ -253,10 +253,10 @@ public class ModelMaintainController {
 					ftpFileInput.close();
 					ftpClient.logout();
 					ftpClient.disconnect();
-					File oldFile = new File(modelSavePath,ftpFileName);
-					if(oldFile.isFile() && oldFile.exists()){
-						oldFile.delete();
-					}
+//					File oldFile = new File(modelSavePath,ftpFileName);
+//					if(oldFile.isFile() && oldFile.exists()){
+//						oldFile.delete();
+//					}
 				} catch (SocketException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();

src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp

@@ -151,6 +151,7 @@ $(".ifRepeate").change(function (){
             $unit.append(new Option("月",3))
 
 		}else{
+            var msg ="";
             alertMsg.forEach(function (t,i) {
                 msg+="<span style='color: red'>"+(i+1)+"."+t+"</span><br />"
             });

src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp

@@ -130,7 +130,7 @@
             kpiName:'${list.kpiName}',businessId:'${list.businessId}'});
     </c:forEach>
 	var dataSourceList = [];
-    <c:forEach var="list" items="${dataSourceList}">
+    <c:forEach var="list" items="${datasourceList}">
     	dataSourceList.push({dataSourceName:'${list.dataSourceName}', dataSourceId:'${list.dataSourceId}'});
     </c:forEach>
 	filterResultDetailTable();

src/main/webapp/static/js/filterResultDetailTable.js

@@ -203,7 +203,6 @@ table_pagging.prototype = {
 
 		},
 		pagging : function(objectJson) {
-			console.log(objectJson)
 			this.objectlist = eval('(' + objectJson + ')');
 
 			if (this.start + this.limit >= this.objectlist.length) {