Skip to content

C
cmszMonitorAnalysis
Commit 5766eec2 authored by liuna's avatar liuna
Browse files
Options

2018年1月1日 --智能分析平台

--修改质量规则和过滤规则全选不联动
parent a0735b9a
Show whitespace changes
Inline Side-by-side
Showing with 280 additions and 242 deletions
.idea/workspace.xml
View file @ 5766eec2
...@@ -6,11 +6,19 @@ ...@@ -6,11 +6,19 @@
</artifacts-to-build> </artifacts-to-build>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="2018年1月15日 --智能分析平台&#10; --修改过滤规则验收新问题"> <list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="2018年1月1日 --智能分析平台&#10; --修改质量规则和过滤规则全选不联动">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FlowMonitor.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/ModelParameterDao.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/ModelParameterDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/analysissupport/FilterRuleResultController.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/analysissupport/FilterRuleResultController.class" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/analysissupport/FilterRuleResultController.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/analysissupport/FilterRuleResultController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/analysissupport/QualityRuleOperationController.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/analysissupport/QualityRuleOperationController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/monitoroperation/AssociateDiagosisDetailController.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/web/monitoroperation/AssociateDiagosisDetailController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <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/entity/FlowMonitor.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FlowMonitor.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" />
<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/QualityRuleMaintain.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/CreateDiagosis.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/CreateDiagosis.jsp" />
</list> </list>
<ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" /> <ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
...@@ -40,18 +48,41 @@ ...@@ -40,18 +48,41 @@
<file leaf-file-name="PzxAnalysisController.java" pinned="false" current-in-tab="false"> <file leaf-file-name="PzxAnalysisController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/PzxAnalysisController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/PzxAnalysisController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-286"> <state relative-caret-position="0">
<caret line="222" column="16" lean-forward="true" selection-start-line="222" selection-start-column="16" selection-end-line="222" selection-end-column="16" /> <caret line="222" column="16" lean-forward="false" selection-start-line="222" selection-start-column="16" selection-end-line="222" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="FilterRuleMaintainController.java" pinned="false" current-in-tab="false">
<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="-807">
<caret line="29" column="13" lean-forward="false" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="QualityRuleMaintainController.java" pinned="false" current-in-tab="false">
<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="273">
<caret line="158" column="13" lean-forward="true" selection-start-line="158" selection-start-column="13" selection-end-line="158" selection-end-column="13" />
<folding>
<element signature="e#4352#4362#0" expanded="true" />
<element signature="e#4484#4490#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PzxDetailInfoViewDao.java" pinned="false" current-in-tab="false"> <file leaf-file-name="PzxDetailInfoViewDao.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/PzxDetailInfoViewDao.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/PzxDetailInfoViewDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-924"> <state relative-caret-position="22">
<caret line="36" column="78" lean-forward="true" selection-start-line="36" selection-start-column="78" selection-end-line="36" selection-end-column="78" /> <caret line="36" column="78" lean-forward="false" selection-start-line="36" selection-start-column="78" selection-end-line="36" selection-end-column="78" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<marker date="1511516636198" expanded="true" signature="827:1349" ph="SELECT to_ch... " /> <marker date="1511516636198" expanded="true" signature="827:1349" ph="SELECT to_ch... " />
...@@ -97,23 +128,11 @@ ...@@ -97,23 +128,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PzxAnalysis.jsp" pinned="false" current-in-tab="false"> <file leaf-file-name="FlowMonitor.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/PzxAnalysis.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="445" column="74" lean-forward="true" selection-start-line="445" selection-start-column="74" selection-end-line="445" selection-end-column="74" />
<folding>
<marker date="1511516640241" expanded="true" signature="42118:42166" ph="..." />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="FlowMonitor.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FlowMonitor.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FlowMonitor.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381"> <state relative-caret-position="161">
<caret line="25" column="28" lean-forward="true" selection-start-line="25" selection-start-column="28" selection-end-line="25" selection-end-column="28" /> <caret line="15" column="57" lean-forward="false" selection-start-line="15" selection-start-column="57" selection-end-line="15" selection-end-column="57" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -124,49 +143,68 @@ ...@@ -124,49 +143,68 @@
<file leaf-file-name="FlowMonitor.jsp" pinned="false" current-in-tab="false"> <file leaf-file-name="FlowMonitor.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154"> <state relative-caret-position="880">
<caret line="40" column="67" lean-forward="true" selection-start-line="40" selection-start-column="67" selection-end-line="40" selection-end-column="67" /> <caret line="40" column="67" lean-forward="false" selection-start-line="40" selection-start-column="67" selection-end-line="40" selection-end-column="67" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="QualityRuleMaintain.jsp" pinned="false" current-in-tab="false"> <file leaf-file-name="CreateDiagosis.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/CreateDiagosis.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22"> <state relative-caret-position="848">
<caret line="56" column="66" lean-forward="false" selection-start-line="56" selection-start-column="66" selection-end-line="56" selection-end-column="66" /> <caret line="733" column="33" lean-forward="true" selection-start-line="733" selection-start-column="33" selection-end-line="733" selection-end-column="33" />
<folding /> <folding>
<marker date="1516348502281" expanded="true" signature="17380:17386" ph="&amp;nbsp;" />
<marker date="1516348502281" expanded="true" signature="17386:17392" ph="&amp;nbsp;" />
<marker date="1516348502281" expanded="true" signature="92510:92523" ph="..." />
<marker date="1516348502281" expanded="true" signature="92612:92618" ph="&amp;nbsp;" />
<marker date="1516348502281" expanded="true" signature="92618:92624" ph="&amp;nbsp;" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="QualityRuleConfiguration.jsp" pinned="false" current-in-tab="false"> <file leaf-file-name="header.jsp" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleConfiguration.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220"> <state relative-caret-position="325">
<caret line="86" column="20" lean-forward="false" selection-start-line="86" selection-start-column="20" selection-end-line="86" selection-end-column="20" /> <caret line="117" column="43" lean-forward="true" selection-start-line="117" selection-start-column="43" selection-end-line="117" selection-end-column="43" />
<folding /> <folding>
<marker date="1516355735320" expanded="true" signature="28911:28935" ph="..." />
<marker date="1516355735320" expanded="true" signature="29153:29167" ph="..." />
<marker date="1516355735320" expanded="true" signature="29439:29453" ph="..." />
<marker date="1516355735320" expanded="true" signature="29727:29741" ph="..." />
<marker date="1516355735320" expanded="true" signature="29904:29921" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="header.jsp" pinned="false" current-in-tab="false"> <file leaf-file-name="FilterRuleMaintain.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22"> <state relative-caret-position="405">
<caret line="117" column="44" lean-forward="false" selection-start-line="117" selection-start-column="44" selection-end-line="117" selection-end-column="44" /> <caret line="242" column="51" lean-forward="false" selection-start-line="242" selection-start-column="51" selection-end-line="242" selection-end-column="51" />
<folding> <folding>
<marker date="1516171606035" expanded="true" signature="28903:28927" ph="..." /> <marker date="1516355187399" expanded="true" signature="7290:7300" ph="..." />
<marker date="1516171606035" expanded="true" signature="29145:29159" ph="..." /> <marker date="1516355187399" expanded="true" signature="17610:17620" ph="..." />
<marker date="1516171606035" expanded="true" signature="29431:29445" ph="..." />
<marker date="1516171606035" expanded="true" signature="29719:29733" ph="..." />
<marker date="1516171606035" expanded="true" signature="29896:29913" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="QualityRuleMaintain.jsp" pinned="false" current-in-tab="false">
<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="155">
<caret line="466" column="0" lean-forward="false" selection-start-line="466" selection-start-column="0" selection-end-line="466" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
...@@ -180,7 +218,6 @@ ...@@ -180,7 +218,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>createAssociDigConfig</find>
<find>dimKpiCheck</find> <find>dimKpiCheck</find>
<find>kpiWeightTd</find> <find>kpiWeightTd</find>
<find>addAnaInfo</find> <find>addAnaInfo</find>
...@@ -210,6 +247,7 @@ ...@@ -210,6 +247,7 @@
<find>provincename</find> <find>provincename</find>
<find>yw_llq</find> <find>yw_llq</find>
<find>#qualityRuleView</find> <find>#qualityRuleView</find>
<find>selectAnaInfo</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>InsideXcdWorkingOrderInfoView</replace> <replace>InsideXcdWorkingOrderInfoView</replace>
...@@ -244,7 +282,6 @@ ...@@ -244,7 +282,6 @@
<option value="$PROJECT_DIR$/src/main/webapp/static/js/associatediagosisdetail.js" /> <option value="$PROJECT_DIR$/src/main/webapp/static/js/associatediagosisdetail.js" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/AssociateDiagosisDetail.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/AssociateDiagosisDetail.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/GZFX__Dimension_Province_detail.tag" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/GZFX__Dimension_Province_detail.tag" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/CreateDiagosis.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/GZFX__Time_Dimension_Province_AssociateDiagosisConfiguration.tag" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/GZFX__Time_Dimension_Province_AssociateDiagosisConfiguration.tag" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/AssociateDiagosisConfiguration.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/AssociateDiagosisConfiguration.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/AssociateDiagosisConfigurationController.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/AssociateDiagosisConfigurationController.java" />
...@@ -262,7 +299,6 @@ ...@@ -262,7 +299,6 @@
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/AssociateDetails.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/AssociateDetails.jsp" />
<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/monitoroperation/FailureStatisticsCriteriaController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleViewDao.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleViewDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleViewService.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleViewService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleOperationController.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleOperationController.java" />
...@@ -280,10 +316,12 @@ ...@@ -280,10 +316,12 @@
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp" />
<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/FilterRuleResultController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FlowMonitor.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/CreateDiagosis.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FlowMonitor.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -359,8 +397,9 @@ ...@@ -359,8 +397,9 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" /> <pane id="AndroidView" />
<pane id="Scratches" /> <pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -384,51 +423,6 @@ ...@@ -384,51 +423,6 @@
<item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" /> <item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" 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="java" type="462c0819:PsiDirectoryNode" />
<item name="com" 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="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="cmsz" 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="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="cmsz" type="462c0819:PsiDirectoryNode" />
<item name="entity" 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="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="cmsz" type="462c0819:PsiDirectoryNode" />
<item name="entity" type="462c0819:PsiDirectoryNode" />
<item name="commonmanage" 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="webapp" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
...@@ -453,7 +447,6 @@ ...@@ -453,7 +447,6 @@
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" /> <pane id="PackagesPane" />
<pane id="AndroidView" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -860,14 +853,13 @@ ...@@ -860,14 +853,13 @@
<workItem from="1515979833834" duration="7707000" /> <workItem from="1515979833834" duration="7707000" />
<workItem from="1516064938318" duration="12183000" /> <workItem from="1516064938318" duration="12183000" />
<workItem from="1516152453873" duration="9658000" /> <workItem from="1516152453873" duration="9658000" />
<workItem from="1516238094563" duration="7087000" /> <workItem from="1516238094563" duration="7703000" />
</task> <workItem from="1516263822172" duration="4827000" />
<task id="LOCAL-00003" summary="first commit"> <workItem from="1516324580384" duration="5358000" />
<created>1507830194949</created> <workItem from="1516330847226" duration="1154000" />
<option name="number" value="00003" /> <workItem from="1516332167798" duration="745000" />
<option name="presentableId" value="LOCAL-00003" /> <workItem from="1516333123713" duration="319000" />
<option name="project" value="LOCAL" /> <workItem from="1516342283686" duration="13387000" />
<updated>1507830194949</updated>
</task> </task>
<task id="LOCAL-00004" summary="2017年10月18日提交记录&#10;--预警与隐患维护页面列表上方增加结果预览按钮&#10;--告警详细页面用列表的方式展示选中的多个协查单信息&#10;--告警详细页面给每个协查单添加告警描述，可编辑&#10;--生成协查单页面增加生成内部协查单按钮（功能未实现）"> <task id="LOCAL-00004" summary="2017年10月18日提交记录&#10;--预警与隐患维护页面列表上方增加结果预览按钮&#10;--告警详细页面用列表的方式展示选中的多个协查单信息&#10;--告警详细页面给每个协查单添加告警描述，可编辑&#10;--生成协查单页面增加生成内部协查单按钮（功能未实现）">
<created>1508309038723</created> <created>1508309038723</created>
...@@ -1205,11 +1197,18 @@ ...@@ -1205,11 +1197,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1516159105779</updated> <updated>1516159105779</updated>
</task> </task>
<option name="localTasksCounter" value="52" /> <task id="LOCAL-00052" summary="2018年1月18日 --智能分析平台&#10; --备份">
<created>1516263108986</created>
<option name="number" value="00052" />
<option name="presentableId" value="LOCAL-00052" />
<option name="project" value="LOCAL" />
<updated>1516263108988</updated>
</task>
<option name="localTasksCounter" value="53" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="745863000" /> <option name="totallyTimeSpent" value="772269000" />
</component> </component>
<component name="TodoView" selected-index="2"> <component name="TodoView" selected-index="2">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -1240,8 +1239,8 @@ ...@@ -1240,8 +1239,8 @@
<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="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.32459018" 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.32459018" 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="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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.447541" sideWeight="0.48907563" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30819672" sideWeight="0.48907563" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.33934426" sideWeight="0.49159664" order="13" 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.70163935" sideWeight="0.49159664" order="13" 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="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="12" 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="16" 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="16" 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.22239032" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22239032" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
...@@ -1347,7 +1346,6 @@ ...@@ -1347,7 +1346,6 @@
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" /> <option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="'指标告警明细 悬浮框' 功能" />
<MESSAGE value="监控运营-&gt;告警关联诊断-&gt;关联诊断明细 界面&#10;默认最近一个月 数据" /> <MESSAGE value="监控运营-&gt;告警关联诊断-&gt;关联诊断明细 界面&#10;默认最近一个月 数据" />
<MESSAGE value="监控运营-&gt;关联配置-&gt;关联诊断明细 界面&#10;table 文本居中" /> <MESSAGE value="监控运营-&gt;关联配置-&gt;关联诊断明细 界面&#10;table 文本居中" />
<MESSAGE value="监控运营 -&gt;关联告警诊断 -&gt;关联诊断配置 -&gt;'修改&amp;创建关联配置' 界面&#10;解决'批量修改参数 权值和出异常'bug" /> <MESSAGE value="监控运营 -&gt;关联告警诊断 -&gt;关联诊断配置 -&gt;'修改&amp;创建关联配置' 界面&#10;解决'批量修改参数 权值和出异常'bug" />
...@@ -1372,7 +1370,8 @@ ...@@ -1372,7 +1370,8 @@
<MESSAGE value="2018年1月15日 --智能分析平台&#10; --修改过滤规则验收新问题" /> <MESSAGE value="2018年1月15日 --智能分析平台&#10; --修改过滤规则验收新问题" />
<MESSAGE value="2018年1月17日 --智能分析平台&#10; --修改质量规则和过滤规则的指标布局" /> <MESSAGE value="2018年1月17日 --智能分析平台&#10; --修改质量规则和过滤规则的指标布局" />
<MESSAGE value="2018年1月15日 --智能分析平台&#10; --修改质量规则和过滤规则页面标题修改" /> <MESSAGE value="2018年1月15日 --智能分析平台&#10; --修改质量规则和过滤规则页面标题修改" />
<option name="LAST_COMMIT_MESSAGE" value="2018年1月15日 --智能分析平台&#10; --修改质量规则和过滤规则页面标题修改" /> <MESSAGE value="2018年1月18日 --智能分析平台&#10; --备份" />
<option name="LAST_COMMIT_MESSAGE" value="2018年1月18日 --智能分析平台&#10; --备份" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -1391,7 +1390,7 @@ ...@@ -1391,7 +1390,7 @@
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="java-line"> <line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/AssociateDiagosisDetailController.java</url> <url>file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/AssociateDiagosisDetailController.java</url>
<line>282</line> <line>297</line>
<properties /> <properties />
<option name="timeStamp" value="81" /> <option name="timeStamp" value="81" />
</line-breakpoint> </line-breakpoint>
...@@ -1443,59 +1442,6 @@ ...@@ -1443,59 +1442,6 @@
</buildFile> </buildFile>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/PzxAnalysis.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="17" column="23" lean-forward="false" selection-start-line="17" selection-start-column="23" selection-end-line="17" selection-end-column="23" />
<folding>
<marker date="1511516640241" expanded="true" signature="42118:42166" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="6" lean-forward="false" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
<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="1232">
<caret line="56" column="66" lean-forward="false" selection-start-line="56" selection-start-column="66" selection-end-line="56" selection-end-column="66" />
<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="1892">
<caret line="86" column="20" lean-forward="false" selection-start-line="86" selection-start-column="20" selection-end-line="86" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<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="1364">
<caret line="62" column="64" lean-forward="false" selection-start-line="62" selection-start-column="64" selection-end-line="62" selection-end-column="64" />
<folding>
<marker date="1516158845145" expanded="true" signature="7290:7300" ph="..." />
<marker date="1516158845145" expanded="true" signature="17653:17663" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FlowMonitorController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="484">
<caret line="22" column="36" lean-forward="false" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2244"> <state relative-caret-position="2244">
...@@ -1509,11 +1455,11 @@ ...@@ -1509,11 +1455,11 @@
<state relative-caret-position="2574"> <state relative-caret-position="2574">
<caret line="117" column="44" lean-forward="false" selection-start-line="117" selection-start-column="44" selection-end-line="117" selection-end-column="44" /> <caret line="117" column="44" lean-forward="false" selection-start-line="117" selection-start-column="44" selection-end-line="117" selection-end-column="44" />
<folding> <folding>
<marker date="1516171606035" expanded="true" signature="28903:28927" ph="..." /> <marker date="1516355735320" expanded="true" signature="28911:28935" ph="..." />
<marker date="1516171606035" expanded="true" signature="29145:29159" ph="..." /> <marker date="1516355735320" expanded="true" signature="29153:29167" ph="..." />
<marker date="1516171606035" expanded="true" signature="29431:29445" ph="..." /> <marker date="1516355735320" expanded="true" signature="29439:29453" ph="..." />
<marker date="1516171606035" expanded="true" signature="29719:29733" ph="..." /> <marker date="1516355735320" expanded="true" signature="29727:29741" ph="..." />
<marker date="1516171606035" expanded="true" signature="29896:29913" ph="..." /> <marker date="1516355735320" expanded="true" signature="29904:29921" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -1629,7 +1575,6 @@ ...@@ -1629,7 +1575,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <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" /> <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> </state>
</provider> </provider>
</entry> </entry>
...@@ -1651,7 +1596,6 @@ ...@@ -1651,7 +1596,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-396"> <state relative-caret-position="-396">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="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" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1728,13 +1672,6 @@ ...@@ -1728,13 +1672,6 @@
</state> </state>
</provider> </provider>
</entry> </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="88">
<caret line="151" column="0" lean-forward="true" selection-start-line="151" selection-start-column="0" selection-end-line="151" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/ruleReportDetailTable.js"> <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/ruleReportDetailTable.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5808"> <state relative-caret-position="-5808">
...@@ -1749,75 +1686,116 @@ ...@@ -1749,75 +1686,116 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleConfiguration.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1364"> <state relative-caret-position="1892">
<caret line="62" column="64" lean-forward="false" selection-start-line="62" selection-start-column="64" selection-end-line="62" selection-end-column="64" /> <caret line="86" column="20" lean-forward="false" selection-start-line="86" selection-start-column="20" selection-end-line="86" selection-end-column="20" />
<folding> <folding />
<marker date="1516158845145" expanded="true" signature="7290:7300" ph="..." />
<marker date="1516158845145" expanded="true" signature="17653:17663" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/PzxDetailInfoView.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22"> <state relative-caret-position="-5">
<caret line="117" column="44" lean-forward="false" selection-start-line="117" selection-start-column="44" selection-end-line="117" selection-end-column="44" /> <caret line="18" column="13" lean-forward="false" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/PzxAnalysis.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="9790">
<caret line="445" column="74" lean-forward="false" selection-start-line="445" selection-start-column="74" selection-end-line="445" selection-end-column="74" />
<folding> <folding>
<marker date="1516171606035" expanded="true" signature="28903:28927" ph="..." /> <marker date="1511516640241" expanded="true" signature="42118:42166" ph="..." />
<marker date="1516171606035" expanded="true" signature="29145:29159" ph="..." />
<marker date="1516171606035" expanded="true" signature="29431:29445" ph="..." />
<marker date="1516171606035" expanded="true" signature="29719:29733" ph="..." />
<marker date="1516171606035" expanded="true" signature="29896:29913" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleConfiguration.jsp"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRule.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193">
<caret line="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleReport.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193">
<caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
</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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220"> <state relative-caret-position="220">
<caret line="86" column="20" lean-forward="false" selection-start-line="86" selection-start-column="20" selection-end-line="86" selection-end-column="20" /> <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp"> <entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22"> <state relative-caret-position="54">
<caret line="56" column="66" lean-forward="false" selection-start-line="56" selection-start-column="66" selection-end-line="56" selection-end-column="66" /> <caret line="116" column="4" lean-forward="false" selection-start-line="116" selection-start-column="4" selection-end-line="116" selection-end-column="4" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/FlowMonitor.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154"> <state relative-caret-position="880">
<caret line="40" column="67" lean-forward="true" selection-start-line="40" selection-start-column="67" selection-end-line="40" selection-end-column="67" /> <caret line="40" column="67" lean-forward="false" selection-start-line="40" selection-start-column="67" selection-end-line="40" selection-end-column="67" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/PzxDetailInfoView.java"> <entry file="jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/resources/html5-schema/html5/web-forms2.rnc">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5"> <state relative-caret-position="193">
<caret line="18" column="13" lean-forward="false" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" /> <caret line="300" column="22" lean-forward="false" selection-start-line="300" selection-start-column="22" selection-end-line="300" selection-end-column="22" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </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="66">
<caret line="48" column="53" lean-forward="true" selection-start-line="48" selection-start-column="53" selection-end-line="48" selection-end-column="53" />
<folding>
<marker date="1515997518047" expanded="true" signature="7918:7928" ph="..." />
</folding>
</state>
</provider>
</entry>
<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="-110">
<caret line="28" column="3" lean-forward="true" selection-start-line="28" selection-start-column="3" selection-end-line="28" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FlowMonitor.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="15" column="57" lean-forward="false" selection-start-line="15" selection-start-column="57" selection-end-line="15" selection-end-column="57" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/PzxAnalysisController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/PzxAnalysisController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-286"> <state relative-caret-position="0">
<caret line="222" column="16" lean-forward="true" selection-start-line="222" selection-start-column="16" selection-end-line="222" selection-end-column="16" /> <caret line="222" column="16" lean-forward="false" selection-start-line="222" selection-start-column="16" selection-end-line="222" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/PzxDetailInfoViewDao.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/PzxDetailInfoViewDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-924"> <state relative-caret-position="22">
<caret line="36" column="78" lean-forward="true" selection-start-line="36" selection-start-column="78" selection-end-line="36" selection-end-column="78" /> <caret line="36" column="78" lean-forward="false" selection-start-line="36" selection-start-column="78" selection-end-line="36" selection-end-column="78" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<marker date="1511516636198" expanded="true" signature="827:1349" ph="SELECT to_ch... " /> <marker date="1511516636198" expanded="true" signature="827:1349" ph="SELECT to_ch... " />
...@@ -1862,48 +1840,68 @@ ...@@ -1862,48 +1840,68 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/PzxAnalysis.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/CreateDiagosis.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528"> <state relative-caret-position="848">
<caret line="445" column="74" lean-forward="true" selection-start-line="445" selection-start-column="74" selection-end-line="445" selection-end-column="74" /> <caret line="733" column="33" lean-forward="true" selection-start-line="733" selection-start-column="33" selection-end-line="733" selection-end-column="33" />
<folding> <folding>
<marker date="1511516640241" expanded="true" signature="42118:42166" ph="..." /> <marker date="1516348502281" expanded="true" signature="17380:17386" ph="&amp;nbsp;" />
<marker date="1516348502281" expanded="true" signature="17386:17392" ph="&amp;nbsp;" />
<marker date="1516348502281" expanded="true" signature="92510:92523" ph="..." />
<marker date="1516348502281" expanded="true" signature="92612:92618" ph="&amp;nbsp;" />
<marker date="1516348502281" expanded="true" signature="92618:92624" ph="&amp;nbsp;" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRule.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193"> <state relative-caret-position="155">
<caret line="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" /> <caret line="466" column="0" lean-forward="false" selection-start-line="466" selection-start-column="0" selection-end-line="466" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleReport.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleMaintainController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193"> <state relative-caret-position="-807">
<caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" /> <caret line="29" column="13" lean-forward="false" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FilterRule.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220"> <state relative-caret-position="405">
<caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" /> <caret line="242" column="51" lean-forward="false" selection-start-line="242" selection-start-column="51" selection-end-line="242" selection-end-column="51" />
<folding> <folding>
<element signature="imports" expanded="false" /> <marker date="1516355187399" expanded="true" signature="7290:7300" ph="..." />
<marker date="1516355187399" expanded="true" signature="17610:17620" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FlowMonitor.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381"> <state relative-caret-position="273">
<caret line="25" column="28" lean-forward="true" selection-start-line="25" selection-start-column="28" selection-end-line="25" selection-end-column="28" /> <caret line="158" column="13" lean-forward="true" selection-start-line="158" selection-start-column="13" selection-end-line="158" selection-end-column="13" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="e#4352#4362#0" expanded="true" />
<element signature="e#4484#4490#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="117" column="43" lean-forward="true" selection-start-line="117" selection-start-column="43" selection-end-line="117" selection-end-column="43" />
<folding>
<marker date="1516355735320" expanded="true" signature="28911:28935" ph="..." />
<marker date="1516355735320" expanded="true" signature="29153:29167" ph="..." />
<marker date="1516355735320" expanded="true" signature="29439:29453" ph="..." />
<marker date="1516355735320" expanded="true" signature="29727:29741" ph="..." />
<marker date="1516355735320" expanded="true" signature="29904:29921" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
......
src/main/java/com/hp/cmsz/entity/FlowMonitor.java
View file @ 5766eec2
...@@ -12,8 +12,8 @@ import java.io.Serializable; ...@@ -12,8 +12,8 @@ import java.io.Serializable;
* @author Liu Na * @author Liu Na
* *
*/ */
@Entity //@Entity
@Table(name = "APP_SM_DB_CITY_KPI_T",schema = "ccolap") //@Table(name = "APP_SM_DB_CITY_KPI_T",schema = "ccolap")
public class FlowMonitor implements Serializable { public class FlowMonitor implements Serializable {
private Long batchId; private Long batchId;
......
src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java
View file @ 5766eec2
...@@ -147,27 +147,19 @@ public class QualityRuleMaintainController { ...@@ -147,27 +147,19 @@ public class QualityRuleMaintainController {
@RequestMapping(value = "/findKpiId*") @RequestMapping(value = "/findKpiId*")
@ResponseBody @ResponseBody
public void findKpiId(@RequestParam(value = "businessIds", defaultValue = "") String businessIds, public List<Object[]> findKpiId(@RequestParam(value = "businessIds", defaultValue = "") String businessIds,
@RequestParam(value = "calCycleValue", defaultValue = "30MI") String calCycleValue, @RequestParam(value = "calCycleValue", defaultValue = "30MI") String calCycleValue,
HttpServletResponse response) { HttpServletResponse response) {
List<Object[]> businessKpiList = new ArrayList<Object[]>();
if(!"".equals(businessIds)){
String[] strs = businessIds.split(","); String[] strs = businessIds.split(",");
List<Long> businessIdlist = new ArrayList<Long>(); List<Long> businessIdlist = new ArrayList<Long>();
for (int i = 0; i < strs.length; i++) { for (int i = 0; i < strs.length; i++) {
businessIdlist.add(Long.valueOf(strs[i])); businessIdlist.add(Long.valueOf(strs[i]));
} }
List<Object[]> businessKpiList = kpiDao.findKpiIdAndKpiNameAndKpiCodeByBusinessIds(calCycleValue, businessIdlist); businessKpiList = kpiDao.findKpiIdAndKpiNameAndKpiCodeByBusinessIds(calCycleValue, businessIdlist);
Gson gson = new Gson();
response.setContentType("text/Xml;charset=gbk");
PrintWriter out = null;
try {
out = response.getWriter();
out.println(gson.toJson(businessKpiList));
} catch (IOException ex1) {
ex1.printStackTrace();
} finally {
out.close();
} }
return businessKpiList;
} }
......
src/main/webapp/WEB-INF/layouts/header.jsp
View file @ 5766eec2
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="${ctx}/MonitorOperation/RegularityAnalysis">数据特征探查</a></li> <li><a href="${ctx}/MonitorOperation/RegularityAnalysis">数据特征探查</a></li>
<li><a href="${ctx}/MonitorOperation/KeyLinkProcessAnalysis">业务环节分析</a></li> <li><a href="${ctx}/MonitorOperation/KeyLinkProcessAnalysis">业务环节分析</a></li>
<li><a href="${ctx}/MonitorOperation/FlowMonitor">实体厅流量监测分析</a></li> <%--<li><a href="${ctx}/MonitorOperation/FlowMonitor">实体厅流量监测分析</a></li>--%>
</ul> </ul>
</li> </li>
</shiro:hasPermission> </shiro:hasPermission>
......
src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp
View file @ 5766eec2
...@@ -241,7 +241,6 @@ ...@@ -241,7 +241,6 @@
beforeSend: function(data) {}, beforeSend: function(data) {},
success: function(data){ success: function(data){
var tbody=$('<tbody></tbody>'); var tbody=$('<tbody></tbody>');
data = JSON.parse(data)
data.forEach(function(t,i){ data.forEach(function(t,i){
var tr = $('<tr></tr>'); var tr = $('<tr></tr>');
tr.empty(); tr.empty();
...@@ -291,6 +290,7 @@ ...@@ -291,6 +290,7 @@
} }
}); });
$(".businessItem").click(function(){ $(".businessItem").click(function(){
businessIds=""; businessIds="";
$("[name='businessinput']:checked").each(function (){ $("[name='businessinput']:checked").each(function (){
...@@ -438,6 +438,13 @@ ...@@ -438,6 +438,13 @@
$(".province").attr("checked",false); $(".province").attr("checked",false);
} }
}); });
$(".province").click(function(){
var clickFlag=true;//是否全部选中
$(".province").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; }
});
$("#allProvince").attr("checked",clickFlag);
});
//业务全选 //业务全选
$("#allBusiness").click(function(){ $("#allBusiness").click(function(){
if($("#allBusiness").attr("checked") == "checked"){//全选 if($("#allBusiness").attr("checked") == "checked"){//全选
...@@ -445,6 +452,19 @@ ...@@ -445,6 +452,19 @@
}else{//不全选 }else{//不全选
$(".businessItem").attr("checked",false); $(".businessItem").attr("checked",false);
} }
businessIds="";
$("[name='businessinput']:checked").each(function (){
businessIds += $(this).val()+",";
});
updateKpi(businessIds);
});
$(".businessItem").click(function(){
var clickFlag=true;//是否全部选中
$(".businessItem").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; }
});
$("#allBusiness").attr("checked",clickFlag);
}); });
//指标全选 //指标全选
$("#allKpi").click(function(){ $("#allKpi").click(function(){
...@@ -454,6 +474,13 @@ ...@@ -454,6 +474,13 @@
$(".kpiItem").attr("checked",false); $(".kpiItem").attr("checked",false);
} }
}); });
$(".kpiItem").click(function(){
var cFlag=true;//是否全部选中
$(".kpiItem").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ cFlag=false; }
});
$("#allKpi").attr("checked",cFlag);
});
</script> </script>
</body> </body>
src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp
View file @ 5766eec2
...@@ -462,8 +462,9 @@ function updateKpi(businessIds,calCycleValue){ ...@@ -462,8 +462,9 @@ function updateKpi(businessIds,calCycleValue){
async: false, async: false,
beforeSend: function(data) {}, beforeSend: function(data) {},
success: function(data){ success: function(data){
console.log(data)
var tbody=$('<tbody></tbody>'); var tbody=$('<tbody></tbody>');
data = JSON.parse(data)
data.forEach(function(t,i){ data.forEach(function(t,i){
var tr = $('<tr></tr>'); var tr = $('<tr></tr>');
tr.empty(); tr.empty();
...@@ -629,6 +630,19 @@ $("#allBusiness").click(function(){ ...@@ -629,6 +630,19 @@ $("#allBusiness").click(function(){
}else{//不全选 }else{//不全选
$(".businessItem").attr("checked",false); $(".businessItem").attr("checked",false);
} }
businessIds="";
$("[name='businessinput']:checked").each(function (){
businessIds += $(this).val()+",";
});
console.log(businessIds);
updateKpi(businessIds,calCycleValue);
});
$(".businessItem").click(function(){
var clickFlag=true;//是否全部选中
$(".businessItem").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false; }
});
$("#allBusiness").attr("checked",clickFlag);
}); });
//指标全选 //指标全选
$("#allKpi").click(function(){ $("#allKpi").click(function(){
...@@ -638,6 +652,13 @@ $("#allKpi").click(function(){ ...@@ -638,6 +652,13 @@ $("#allKpi").click(function(){
$(".kpiItem").attr("checked",false); $(".kpiItem").attr("checked",false);
} }
}); });
$(".kpiItem").click(function(){
var cFlag=true;//是否全部选中
$(".kpiItem").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ cFlag=false; }
});
$("#allKpi").attr("checked",cFlag);
});
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment