Skip to content

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

2017年12月3日 智能分析平台提交内容

--数据质量核查下质量规则新增页面完成
parent 29444a6f
Show whitespace changes
Inline Side-by-side
Showing with 364 additions and 248 deletions
.idea/workspace.xml
View file @ c30ebd21
......@@ -8,20 +8,15 @@
<component name="ChangeListManager">
<list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="">
<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/repository/AccuracyRuleDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/AccuracyRuleDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleInfoDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleInfoDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/AccuracyRuleService.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/AccuracyRuleService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleMaintainController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleMaintainController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.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/java/com/hp/cmsz/web/analysissupport/QualityRuleOperationController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleOperationController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/QualityRule_IfFilter.tag" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/QualityRule_IfFilter.tag" />
<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/QualityRuleConfiguration.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleConfiguration.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/AnalysisSupport/QualityRuleOperation.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleOperation.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/ruleResultDetailTable.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/ruleResultDetailTable.js" />
</list>
<ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -36,45 +31,107 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="QualityRuleMaintainController.java" pinned="false" current-in-tab="false">
<file leaf-file-name="QualityRuleOperationController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleOperationController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="128" column="64" lean-forward="false" selection-start-line="128" selection-start-column="64" selection-end-line="128" selection-end-column="64" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="QualityRuleMaintainController.java" pinned="false" current-in-tab="true">
<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="748">
<caret line="74" column="40" lean-forward="true" selection-start-line="52" selection-start-column="4" selection-end-line="74" selection-end-column="40" />
<folding>
<element signature="e#8847#8853#0" expanded="true" />
<element signature="e#9016#9022#0" expanded="true" />
<element signature="e#9180#9186#0" expanded="true" />
</folding>
<state relative-caret-position="196">
<caret line="320" column="110" lean-forward="true" selection-start-line="320" selection-start-column="110" selection-end-line="320" selection-end-column="110" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ModelMaintainController.java" pinned="false" current-in-tab="true">
<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="-891">
<caret line="57" column="13" lean-forward="false" selection-start-line="57" selection-start-column="13" selection-end-line="57" selection-end-column="13" />
<state relative-caret-position="251">
<caret line="219" column="9" lean-forward="true" selection-start-line="216" selection-start-column="8" selection-end-line="219" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ModelParameterService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/modelmanage/ModelParameterService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="23" column="16" lean-forward="false" selection-start-line="23" selection-start-column="16" selection-end-line="23" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ruleResultDetailTable.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/ruleResultDetailTable.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="287">
<caret line="314" column="136" lean-forward="true" selection-start-line="314" selection-start-column="136" selection-end-line="314" selection-end-column="136" />
<folding>
<marker date="1512297391671" expanded="true" signature="10988:11000" ph="..." />
<marker date="1512297391671" expanded="true" signature="15330:15340" ph="..." />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AccuracyRule.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/AccuracyRule.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="41">
<caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="35" />
<state relative-caret-position="151">
<caret line="40" column="94" lean-forward="false" selection-start-line="40" selection-start-column="77" selection-end-line="40" selection-end-column="94" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ModelParameterDao.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ModelParameterDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-132">
<caret line="26" column="14" lean-forward="true" selection-start-line="26" selection-start-column="14" selection-end-line="26" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AccuracyRuleDao.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/AccuracyRuleDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="26">
<caret line="26" column="71" lean-forward="false" selection-start-line="26" selection-start-column="71" selection-end-line="26" selection-end-column="71" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ModelMaintain.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelMaintain.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="263" column="12" lean-forward="true" selection-start-line="263" selection-start-column="12" selection-end-line="263" selection-end-column="12" />
<folding>
<marker date="1511516952446" expanded="true" signature="10247:10253" ph="&amp;nbsp;" />
<marker date="1511516952446" expanded="true" signature="10253:10259" ph="&amp;nbsp;" />
</folding>
</state>
</provider>
</entry>
</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="848">
<caret line="496" column="0" lean-forward="false" selection-start-line="496" selection-start-column="0" selection-end-line="541" selection-end-column="0" />
<state relative-caret-position="-5918">
<caret line="212" column="43" lean-forward="false" selection-start-line="212" selection-start-column="43" selection-end-line="212" selection-end-column="43" />
<folding />
</state>
</provider>
......@@ -94,8 +151,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>statsDatasourceChange</find>
<find>datasourceStats</find>
<find>businessItem</find>
<find>businesstd</find>
<find>WdatePicker</find>
......@@ -124,6 +179,8 @@
<find>ruleSubmit</find>
<find>updateRule</find>
<find>ruleMaintainForm</find>
<find>repeatedCheckEndTime</find>
<find>dataModelIdList</find>
</findStrings>
<replaceStrings>
<replace>InsideXcdWorkingOrderInfoView</replace>
......@@ -176,27 +233,27 @@
<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/web/analysissupport/QualityRuleResultController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/ruleResultDetailTable.js" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/ruleOperationDetailTable.js" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleView.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleInfo.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.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/QualityRuleResult.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/QualityRule_IfFilter.tag" />
<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/QualityRuleInfoDao.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/service/analysissupport/QualityRuleInfoService.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleOperation.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleConfiguration.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/AccuracyRuleService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/AccuracyRuleDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleMaintainController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.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/QualityRuleConfiguration.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.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/service/analysissupport/QualityRuleInfoService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleInfoDao.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/ruleResultDetailTable.js" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/AccuracyRuleDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" />
</list>
</option>
</component>
......@@ -248,6 +305,9 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="AndroidView" />
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
......@@ -296,6 +356,25 @@
<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="webapp" type="462c0819:PsiDirectoryNode" />
</path>
<path>
......@@ -319,9 +398,6 @@
<select />
</subPane>
</pane>
<pane id="AndroidView" />
<pane id="Scope" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -574,7 +650,8 @@
<workItem from="1511860853640" duration="322000" />
<workItem from="1511861266553" duration="41183000" />
<workItem from="1512006065543" duration="10575000" />
<workItem from="1512018064699" duration="60738000" />
<workItem from="1512018064699" duration="83673000" />
<workItem from="1512294466328" duration="5558000" />
</task>
<task id="LOCAL-00001" summary="first commit">
<created>1507828551888</created>
......@@ -674,11 +751,18 @@
<option name="project" value="LOCAL" />
<updated>1512094012168</updated>
</task>
<option name="localTasksCounter" value="15" />
<task id="LOCAL-00015" summary="2017年12月2日 智能分析平台提交内容&#10; --数据质量核查下过滤规则页面联动">
<created>1512198401551</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1512198401551</updated>
</task>
<option name="localTasksCounter" value="16" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="425330000" />
<option name="totallyTimeSpent" value="453823000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -709,7 +793,7 @@
<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.32786885" sideWeight="0.5" order="9" 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="true" show_stripe_button="true" weight="0.29344264" sideWeight="0.4939394" 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.28032786" 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="false" show_stripe_button="true" weight="0.13934426" 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.32786885" 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" />
......@@ -746,17 +830,17 @@
<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.34754097" 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.32786885" 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="true" show_stripe_button="true" weight="0.2967213" sideWeight="0.5" order="11" 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.2967213" sideWeight="0.5" order="11" 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.32786885" sideWeight="0.5" order="9" 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="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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.66885245" 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="false" show_stripe_button="true" weight="0.5344262" 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="true" show_stripe_button="true" weight="0.5672131" 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="false" show_stripe_button="true" weight="0.13934426" 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.32786885" 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.23827533" 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="false" show_stripe_button="true" weight="0.23600605" 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="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" />
......@@ -819,7 +903,8 @@
<MESSAGE value="2017年11月09 智能分析平台提交内容&#10; --数据库脚本更新" />
<MESSAGE value="2017年11月28 智能分析平台提交内容&#10; --质量规则维护" />
<MESSAGE value="2017年12月1日 智能分析平台提交内容&#10; --数据质量核查" />
<option name="LAST_COMMIT_MESSAGE" value="2017年12月1日 智能分析平台提交内容&#10; --数据质量核查" />
<MESSAGE value="2017年12月2日 智能分析平台提交内容&#10; --数据质量核查下过滤规则页面联动" />
<option name="LAST_COMMIT_MESSAGE" value="2017年12月2日 智能分析平台提交内容&#10; --数据质量核查下过滤规则页面联动" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -848,86 +933,6 @@
</buildFile>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/PzxDetailInfoView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="38">
<caret line="17" column="15" lean-forward="true" selection-start-line="17" selection-start-column="15" selection-end-line="17" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1056">
<caret line="27" column="32" lean-forward="true" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/DataModelDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-20">
<caret line="37" column="14" lean-forward="true" selection-start-line="37" selection-start-column="14" selection-end-line="37" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/PeriodTag.tag">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2046">
<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/webapp/WEB-INF/tags/GZFX_Period_stats.tag">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="101" column="9" lean-forward="false" selection-start-line="101" selection-start-column="9" selection-end-line="101" selection-end-column="22" />
<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="493">
<caret line="29" column="88" lean-forward="true" selection-start-line="29" selection-start-column="88" selection-end-line="29" selection-end-column="88" />
<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="-2897">
<caret line="61" column="6" lean-forward="false" selection-start-line="61" selection-start-column="6" selection-end-line="61" selection-end-column="6" />
<folding>
<marker date="1512092899872" expanded="true" signature="28676:28700" ph="..." />
<marker date="1512092899872" expanded="true" signature="28918:28932" ph="..." />
<marker date="1512092899872" expanded="true" signature="29204:29218" ph="..." />
<marker date="1512092899872" expanded="true" signature="29492:29506" ph="..." />
<marker date="1512092899872" expanded="true" signature="29669:29686" ph="..." />
</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="-3239">
<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/webapp/WEB-INF/tags/PZX_Ifkey.tag">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-80">
<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/webapp/WEB-INF/tags/WarningFilter.tag">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-220">
......@@ -940,7 +945,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="142">
<caret line="45" column="0" lean-forward="false" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -948,7 +952,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="96">
<caret line="27" column="13" lean-forward="false" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -972,7 +975,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="118">
<caret line="29" column="22" lean-forward="false" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
......@@ -980,7 +982,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="57" column="40" lean-forward="false" selection-start-line="57" selection-start-column="40" selection-end-line="57" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
......@@ -999,7 +1000,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-168">
<caret line="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -1007,12 +1007,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="27" column="32" lean-forward="false" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" />
<folding>
<marker date="1511516636214" expanded="true" signature="3800:4315" ph="SELECT TO_CH... " />
<marker date="1511516636214" expanded="true" signature="4473:4979" ph="select to_ch... " />
<marker date="1511516636214" expanded="true" signature="5256:5919" ph="SELECT TO_CH... " />
<marker date="1511516636214" expanded="true" signature="6216:6835" ph="SELECT TO_CH... " />
</folding>
</state>
</provider>
</entry>
......@@ -1020,7 +1014,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="155">
<caret line="139" column="84" lean-forward="true" selection-start-line="139" selection-start-column="84" selection-end-line="139" selection-end-column="84" />
<folding />
</state>
</provider>
</entry>
......@@ -1028,7 +1021,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206">
<caret line="214" column="68" lean-forward="true" selection-start-line="214" selection-start-column="68" selection-end-line="214" selection-end-column="68" />
<folding />
</state>
</provider>
</entry>
......@@ -1057,9 +1049,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="37">
<caret line="17" column="13" lean-forward="false" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1067,7 +1056,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="19" column="44" lean-forward="false" selection-start-line="19" selection-start-column="44" selection-end-line="19" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
......@@ -1075,9 +1063,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="13" column="26" lean-forward="false" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -1089,27 +1074,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="13" column="8" lean-forward="true" selection-start-line="13" selection-start-column="8" selection-end-line="13" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleInfoDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="20" column="45" lean-forward="false" selection-start-line="20" selection-start-column="45" selection-end-line="20" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleInfo.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="156">
<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>
......@@ -1117,9 +1085,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="111">
<caret line="37" column="23" lean-forward="false" selection-start-line="37" selection-start-column="23" selection-end-line="37" selection-end-column="57" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -1127,41 +1092,34 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-12143">
<caret line="67" column="13" lean-forward="false" selection-start-line="67" selection-start-column="13" selection-end-line="67" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRule.java">
<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="-153">
<caret line="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
<folding />
<state relative-caret-position="286">
<caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/AccuracyRuleService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="199" column="139" lean-forward="false" selection-start-line="199" selection-start-column="139" selection-end-line="199" selection-end-column="158" />
<folding />
<state relative-caret-position="215">
<caret line="32" column="40" lean-forward="true" selection-start-line="32" selection-start-column="40" selection-end-line="32" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelMaintain.jsp">
<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="1496">
<caret line="112" column="40" lean-forward="false" selection-start-line="112" selection-start-column="40" selection-end-line="112" selection-end-column="40" />
<folding>
<marker date="1511516952446" expanded="true" signature="10247:10253" ph="&amp;nbsp;" />
<marker date="1511516952446" expanded="true" signature="10253:10259" ph="&amp;nbsp;" />
</folding>
<state relative-caret-position="-168">
<caret line="48" column="40" lean-forward="false" selection-start-line="48" selection-start-column="40" selection-end-line="48" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMonitorController.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="286">
<caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
<state relative-caret-position="864">
<caret line="202" column="33" lean-forward="false" selection-start-line="202" selection-start-column="33" selection-end-line="202" selection-end-column="33" />
<folding />
</state>
</provider>
......@@ -1170,30 +1128,51 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193">
<caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderUpdate.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1151">
<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/webapp/WEB-INF/views/AnalysisSupport/QualityRuleConfiguration.jsp">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderUpdateController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1723">
<caret line="52" column="13" lean-forward="false" selection-start-line="52" selection-start-column="13" selection-end-line="52" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="9849">
<caret line="557" column="7" lean-forward="false" selection-start-line="557" selection-start-column="7" selection-end-line="557" selection-end-column="7" />
<state relative-caret-position="88">
<caret line="241" column="4" lean-forward="false" selection-start-line="241" selection-start-column="4" selection-end-line="252" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataModel.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/QualityRule.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-374">
<caret line="126" column="65" lean-forward="true" selection-start-line="126" selection-start-column="65" selection-end-line="126" selection-end-column="65" />
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelParameterConfiguration.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-44">
<caret line="37" column="48" lean-forward="true" selection-start-line="37" selection-start-column="48" selection-end-line="37" selection-end-column="48" />
<state relative-caret-position="506">
<caret line="164" column="31" lean-forward="true" selection-start-line="164" selection-start-column="31" selection-end-line="164" selection-end-column="31" />
<folding>
<marker date="1511516640315" expanded="true" signature="12804:12810" ph="&amp;nbsp;" />
<marker date="1511516640315" expanded="true" signature="12810:12816" ph="&amp;nbsp;" />
......@@ -1201,94 +1180,156 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/AccuracyRuleDao.java">
<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="594">
<caret line="36" column="151" lean-forward="false" selection-start-line="36" selection-start-column="151" selection-end-line="36" selection-end-column="151" />
<state relative-caret-position="353">
<caret line="189" column="50" lean-forward="true" selection-start-line="189" selection-start-column="50" selection-end-line="189" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/AccuracyRuleService.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="215">
<caret line="32" column="40" lean-forward="true" selection-start-line="32" selection-start-column="40" selection-end-line="32" selection-end-column="40" />
<folding />
<state relative-caret-position="-1415">
<caret line="100" column="15" lean-forward="false" selection-start-line="100" selection-start-column="15" selection-end-line="100" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleOperationController.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WarnAnalysisDetailController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1797">
<caret line="35" column="2" lean-forward="true" selection-start-line="35" selection-start-column="2" selection-end-line="35" selection-end-column="2" />
<state relative-caret-position="-4146">
<caret line="280" column="20" lean-forward="true" selection-start-line="280" selection-start-column="20" selection-end-line="280" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/PzxDetailInfoViewDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-54">
<caret line="51" column="18" lean-forward="false" selection-start-line="51" selection-start-column="18" selection-end-line="51" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/PzxAttributeDetailController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="598">
<caret line="159" column="62" lean-forward="false" selection-start-line="159" selection-start-column="62" selection-end-line="159" selection-end-column="62" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="26" column="48" lean-forward="false" selection-start-line="26" selection-start-column="48" selection-end-line="26" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.java">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleInfoDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1865">
<caret line="245" column="59" lean-forward="false" selection-start-line="245" selection-start-column="59" selection-end-line="245" selection-end-column="59" />
<state relative-caret-position="286">
<caret line="22" column="0" lean-forward="false" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="331">
<caret line="260" column="8" lean-forward="false" selection-start-line="260" selection-start-column="8" selection-end-line="260" selection-end-column="8" />
<state relative-caret-position="5104">
<caret line="266" column="68" lean-forward="false" selection-start-line="266" selection-start-column="68" selection-end-line="266" selection-end-column="68" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/AccuracyRule.java">
<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="41">
<caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="35" />
<state relative-caret-position="2068">
<caret line="94" column="64" lean-forward="false" selection-start-line="94" selection-start-column="64" selection-end-line="94" selection-end-column="64" />
<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/QualityRuleOperationController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-168">
<caret line="48" column="40" lean-forward="false" selection-start-line="48" selection-start-column="40" selection-end-line="48" selection-end-column="40" />
<state relative-caret-position="418">
<caret line="128" column="64" lean-forward="false" selection-start-line="128" selection-start-column="64" selection-end-line="128" selection-end-column="64" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java">
<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="748">
<caret line="74" column="40" lean-forward="true" selection-start-line="52" selection-start-column="4" selection-end-line="74" selection-end-column="40" />
<state relative-caret-position="-5918">
<caret line="212" column="43" lean-forward="false" selection-start-line="212" selection-start-column="43" selection-end-line="212" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/ruleResultDetailTable.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="287">
<caret line="314" column="136" lean-forward="true" selection-start-line="314" selection-start-column="136" selection-end-line="314" selection-end-column="136" />
<folding>
<element signature="e#8847#8853#0" expanded="true" />
<element signature="e#9016#9022#0" expanded="true" />
<element signature="e#9180#9186#0" expanded="true" />
<marker date="1512297391671" expanded="true" signature="10988:11000" ph="..." />
<marker date="1512297391671" expanded="true" signature="15330:15340" ph="..." />
</folding>
</state>
</provider>
</entry>
<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/ModelManage/ModelMaintain.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="263" column="12" lean-forward="true" selection-start-line="263" selection-start-column="12" selection-end-line="263" selection-end-column="12" />
<folding>
<marker date="1511516952446" expanded="true" signature="10247:10253" ph="&amp;nbsp;" />
<marker date="1511516952446" expanded="true" signature="10253:10259" ph="&amp;nbsp;" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/modelmanage/ModelParameterService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="848">
<caret line="496" column="0" lean-forward="false" selection-start-line="496" selection-start-column="0" selection-end-line="541" selection-end-column="0" />
<state relative-caret-position="136">
<caret line="23" column="16" lean-forward="false" selection-start-line="23" selection-start-column="16" selection-end-line="23" selection-end-column="16" />
<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/entity/AccuracyRule.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="864">
<caret line="202" column="33" lean-forward="false" selection-start-line="202" selection-start-column="33" selection-end-line="202" selection-end-column="33" />
<state relative-caret-position="151">
<caret line="40" column="94" lean-forward="false" selection-start-line="40" selection-start-column="77" selection-end-line="40" selection-end-column="94" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ModelParameterDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-132">
<caret line="26" column="14" lean-forward="true" selection-start-line="26" selection-start-column="14" selection-end-line="26" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/AccuracyRuleDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="26">
<caret line="26" column="71" lean-forward="false" selection-start-line="26" selection-start-column="71" selection-end-line="26" selection-end-column="71" />
<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="-891">
<caret line="57" column="13" lean-forward="false" selection-start-line="57" selection-start-column="13" selection-end-line="57" selection-end-column="13" />
<state relative-caret-position="251">
<caret line="219" column="9" lean-forward="true" selection-start-line="216" selection-start-column="8" selection-end-line="219" selection-end-column="9" />
<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="196">
<caret line="320" column="110" lean-forward="true" selection-start-line="320" selection-start-column="110" selection-end-line="320" selection-end-column="110" />
<folding />
</state>
</provider>
......
src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.java
View file @ c30ebd21
......@@ -26,4 +26,5 @@ public class QualityRuleInfoService {
public List<QualityRuleInfo> getQualityRuleInfoBy(Timestamp time1 , Timestamp time2, List<Long> dataSource, List<Long> chnnal, List<Long> busines, List<Long>province, List<Long> ifFilter){
return qualityRuleInfoDao.findByBusinessTimeBetweenAndDataSourceIdInAndChannelIdInAndBusinessIdInAndProvinceIdInAndIfFilterInOrderByBusinessTimeDesc(time1, time2,dataSource,chnnal,busines,province,ifFilter);
}
}
src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.java
View file @ c30ebd21
......@@ -2,6 +2,7 @@ package com.hp.cmsz.web.analysissupport;
import java.io.IOException;
import java.io.PrintWriter;
import java.sql.Timestamp;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
......@@ -118,6 +119,8 @@ public class QualityRuleConfigurationController {
model.put("businessList", gson.toJson(businessList));
model.put("dataTypeList", dataTypeList);
model.put("dataSourceList", dataSourceList);
model.put("qualityRule",qualityRule);
model.put("accuracyRuleList",accuracyRuleList);
return PageURLController.RuleConfiguration;
}
......@@ -246,18 +249,22 @@ public class QualityRuleConfigurationController {
}
@RequestMapping(value = "/updateQualityRuleForm",method=RequestMethod.POST)
public String updateQualityRuleForm(@RequestParam(value="businessid") String businessId,
public String updateQualityRuleForm(@RequestParam(value="qualityRuleId") String qualityRuleId,
@RequestParam(value="businessid") String businessId,
@RequestParam(value="provinceid") String provinceId,
@RequestParam(value="channelid") String channelId,
@RequestParam(value="dataSourceid") String dataSourceId,
@RequestParam(value="kpiid") String kpiId,
@RequestParam(value="kpiMonitorTime") String kpiMonitorTime,
@RequestParam(value="kpiMonitorTimeValue") String kpiMonitorTimeValue,
@RequestParam(value="kpiUnit") String kpiUnit,
@RequestParam(value="businessTime") String businessTime,
HttpServletResponse response, HttpServletRequest request) throws ParseException {
System.out.println("businessId"+businessId+"provinceid"+provinceId+"channelId"+channelId+"dataSourceId"+dataSourceId+"kpi"+kpiId+"kpiMonitorTime"+kpiMonitorTime+"businessTime"+businessTime);
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
QualityRule qualityRule = new QualityRule();
qualityRule.setRuleUpdateTime(Timestamp.valueOf(sd.format(new Date())));
qualityRule.setBusinessTime(Timestamp.valueOf(businessTime));
return PageURLController.RuleConfiguration;
......
src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java
View file @ c30ebd21
......@@ -13,6 +13,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.hp.cmsz.service.analysissupport.AccuracyRuleService;
import com.hp.cmsz.service.analysissupport.QualityRuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
......@@ -84,6 +85,9 @@ public class QualityRuleMaintainController {
private AccuracyRuleDao accuracyRuleDao;
@Autowired
private AccuracyRuleService accuracyRuleService;
@Autowired
private CmszOperationLogService cmszOperationLogService;
@RequestMapping(value = "")
......@@ -194,13 +198,14 @@ public class QualityRuleMaintainController {
@RequestParam(value="repeatedCheckMaxTime") String repeatedCheckMaxTime,
@RequestParam(value="ifRepeatedCheckSummation") String ifRepeatedCheckSummation,
HttpServletResponse response,HttpServletRequest request) {
System.out.println("ruleType"+ruleType);
System.out.println("ruleType" + ruleType);
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
AccuracyRule accuracyRule = new AccuracyRule();
if (!ruleType.trim().equals("")) {
if (ruleType == "1") {
if (ruleType.equals("1")) {
accuracyRule.setRuleType("范围");
} else if (ruleType == "2") {
System.out.println("rule" + accuracyRule.getRuleType());
} else if (ruleType.equals("2")) {
accuracyRule.setRuleType("重复");
}
if (!scopeMaxValue.trim().equals("")) {
......@@ -244,7 +249,6 @@ public class QualityRuleMaintainController {
qualityRuleIdList.add(qualityRuleId);
}
}
//新增质量模型
@RequestMapping(value = "/saveRuleDataForm", method = RequestMethod.POST)
public String saveRuleDataForm (@RequestParam(value="businessinput") String business,
......@@ -253,11 +257,11 @@ public class QualityRuleMaintainController {
@RequestParam(value="dataSource") String dataSourceId,
@RequestParam(value="kpiinput") String kpi,
@RequestParam(value="kpiUnit") String kpiUnit,
@RequestParam(value="kpiMonitorTime") String kpiMonitorTime,
@RequestParam(value="kpiMonitorTimeValue") String kpiMonitorTimeValue,
@RequestParam(value="businessTime") String businessTime,
HttpServletResponse response, HttpServletRequest request) throws ParseException {
System.out.println("0000"+kpiUnit);
System.out.println("kpiUnit:"+kpiUnit+"kpiMonitorTimeValue:"+kpiMonitorTimeValue);
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
List<Long> provinceIdList = new ArrayList<Long>();
......@@ -279,9 +283,33 @@ public class QualityRuleMaintainController {
qualityRule.setKpiId(kpiIdList.get(l));
if(!channel.trim().equals("")){ qualityRule.setChannelId(Long.parseLong(channel)); }
if(!dataSourceId.trim().equals("")){ qualityRule.setDataSourceId(Long.parseLong(dataSourceId)); }
if(!kpiMonitorTime.trim().equals("")){ qualityRule.setKpiMonitorTime(kpiMonitorTime); }
qualityRule.setKpiMonitorRunTime(Timestamp.valueOf(sd.format(new Date())));
if(!kpiMonitorTimeValue.trim().equals("")){
if(kpiUnit.equals("0")){
qualityRule.setKpiMonitorTime(kpiMonitorTimeValue+"/1440");
} else if(kpiUnit.equals("1")){
qualityRule.setKpiMonitorTime(kpiMonitorTimeValue+"/24");
} else if(kpiUnit.equals("2")){
qualityRule.setKpiMonitorTime(kpiMonitorTimeValue);
} else if(kpiUnit.equals("3")){
qualityRule.setKpiMonitorTime("ADD_MONTH("+kpiMonitorTimeValue+")");
}
}
if(!businessTime.trim().equals("")){ qualityRule.setBusinessTime(Timestamp.valueOf(businessTime)); }
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
System.out.println(businessTime);
System.out.println("sdf.parse(businessTime)"+sdf.parse(businessTime));
System.out.println("毫秒："+sdf.parse(businessTime).getTime());
if(!kpiMonitorTimeValue.trim().equals("")){
if(kpiUnit.equals("0")){
qualityRule.setKpiMonitorRunTime(Timestamp.valueOf(sd.format(sd.parse(businessTime).getTime()+Integer.parseInt(kpiMonitorTimeValue)*60*1000)));
} else if(kpiUnit.equals("1")){
qualityRule.setKpiMonitorRunTime(Timestamp.valueOf(sd.format(sd.parse(businessTime).getTime()+Integer.parseInt(kpiMonitorTimeValue)*60*60*1000)));
} else if(kpiUnit.equals("2")){
qualityRule.setKpiMonitorRunTime(Timestamp.valueOf(sd.format(sd.parse(businessTime).getTime()+Integer.parseInt(kpiMonitorTimeValue)*24*60*60*1000)));
} else if(kpiUnit.equals("3")){
qualityRule.setKpiMonitorRunTime(Timestamp.valueOf(sd.format(sd.parse(businessTime).getMonth()+Integer.parseInt(kpiMonitorTimeValue))));
}
}
qualityRule.setRuleCrtTime(Timestamp.valueOf(sd.format(new Date())));
qualityRule.setRuleUpdateTime(Timestamp.valueOf(sd.format(new Date())));
qualityRule.setRuleValidFlag("0");
......@@ -289,6 +317,11 @@ public class QualityRuleMaintainController {
qualityRuleDao.save(qualityRule);
cmszOperationLogService.createLog("增加", "新建质量模型", "quality_rule_warehouse_info_t. QUALITY_RULE_ID=" + qualityRule.getQualityRuleId().toString());
Long qualityRuleId = qualityRule.getQualityRuleId();
if(!qualityRuleIdList.isEmpty()){
accuracyRuleService.updateAccuracyRuleByAccuracyRuleIds(qualityRuleId, qualityRuleIdList);
qualityRuleIdList.clear();
}
}
}
......
src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleOperationController.java
View file @ c30ebd21
......@@ -125,7 +125,7 @@ public class QualityRuleOperationController {
List<Long> bussinesList=changeStrToList(bussinesS);
List<Long> provinceList=changeStrToList(provinceS);
List<Long> ifFilterList=changeStrToList(ifFilterS);
System.out.println("qualityRule:"+time1+time2+"data"+dataSourceList+"busin"+bussinesList+"procin"+provinceList+"if"+ifFilterList);
System.out.println("time:"+time1+time2+"data"+dataSourceList+"busin"+bussinesList+"procin"+provinceList+"if"+ifFilterList);
qualityRuleInfoList = qualityRuleInfoService.getQualityRuleInfoBy(time1,time2,dataSourceList,chnnalList,bussinesList,provinceList,ifFilterList);
Gson gson = new Gson();
response.setContentType("text/Xml;charset=gbk");
......
src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleConfiguration.jsp
View file @ c30ebd21
......@@ -106,7 +106,7 @@
</tr>
<tr><td>指标监控时间（<font color="red">必填</font>）：</td>
<td>
<input type="text" style="width:200px" name="kpiMonitorTime" id="kpiMonitorTime" style="display: inline;" />
<input type="text" style="width:200px" name="kpiMonitorTimeValue" id="kpiMonitorTimeValue" />
<select style="width:200px" name="kpiUnit" id="kpiUnit" style="display: inline;">
<option value="0">分钟</option>
<option value="1">小时</option>
......@@ -171,7 +171,29 @@
</div>
</div>
</div>
<script type="text/javascript">
//加载页面时显示
var getQualityRuleId = "${qualityRule.qualityRuleId}";
var getProvince = "${qualityRule.provinceId}";
var getDataSource = "${qualityRule.dataSourceId}";
var getChannel = "${qualityRule.channelId}";
var getBusinessinput = "${qualityRule.businessId}";
var getKpiinput = "${qualityRule.kpiId}";
var getCalCycle = "${qualityRule.calCycle}";
var getKpiMonitorTimeValue = "${qualityRule.kpiMonitorTimeValue}";
var getKpiUnit = "${qualityRule.kpiUnit}";
var getBusinessTime = "${qualityRule.businessTime}";
$("#qualityRuleId").text(getQualityRuleId);
$("#province").val(getProvince);
$("#dataSource").val(getDataSource);
$("#channel").val(getChannel);
$(".businessinput").val(getBusinessinput);
$(".kpiinput").val(getKpiinput);
$("#calCycle").val(getCalCycle);
$("#kpiMonitorTimeValue").val(getKpiMonitorTimeValue);
$("#kpiUnit").val(getKpiUnit);
$("#businessTime").val(getBusinessTime);
</script>
<script type="text/javascript">
$(".range").hide();
$(".repeate").hide();
......
src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp
View file @ c30ebd21
......@@ -99,7 +99,7 @@
</tr>
<tr><td>指标监控时间（<font color="red">必填</font>）：</td>
<td>
<input type="text" style="width:200px" name="kpiMonitorTime" id="kpiMonitorTime" style="display: inline;" />
<input type="text" name="kpiMonitorTimeValue" id="kpiMonitorTimeValue" style="display: inline;" />
<select name="kpiUnit" id="kpiUnit">
<option value="0">分钟</option>
<option value="1">小时</option>
......@@ -261,7 +261,7 @@ $("#addParam").click(function(){
//form表单提交
$("#ruleSubmit").click(function(){
if($.trim($("#kpiMonitorTime").val())==""){
if($.trim($("#kpiMonitorTimeValue").val())==""){
$.alert("指标监控时间不能为空");
}else if($("#businessTime").val()==""){
$.alert("指标业务时间不能为空");
......
src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp
View file @ c30ebd21
......@@ -124,7 +124,7 @@ $("#createRule").click(function(){
$.dialog({
title: "提醒",
content:"确定修改质量规则？",
ok: function(){location.href="${ctx}/AnalysisSupport/RuleConfiguration?qualityRuleId="+qualityRuleId;},
ok: function(){location.href="${ctx}/AnalysisSupport/QualityRuleConfiguration?qualityRuleId="+qualityRuleId;},
okValue:"确定",
cancel: function(){},
cancelValue:"取消",
......
src/main/webapp/static/js/ruleResultDetailTable.js
View file @ c30ebd21
......@@ -302,11 +302,23 @@ table_pagging.prototype = {
}
if(k==10){
if(tdContext!="&nbsp;"){
tdContext = df.format(new Date(tdContext));
if(tdContext.indexOf("/")!=-1){
var a = new Array();
a = tdContext.split("/");
if(a[1] == "1440") {
tdContext = a[0] + "分钟";
}else if(a[1] == "24"){
tdContext = a[0] + "小时";
}
} else {
if (tdContext.indexOf("ADD") != -1) {
tdContext = tdContext.substring(tdContext.indexOf("(") + 1, tdContext.length - 1) + "个月"
} else {
tdContext = tdContext + "天";
}
}
}
if(k==11){
if(tdContext!="&nbsp;"){
......
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