Commit fcf75446 authored by afe's avatar afe

智能分析平台提交备份

parent a52e5e9e
...@@ -7,48 +7,9 @@ ...@@ -7,48 +7,9 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment=""> <list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/APPEWarningDetail.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/AccuracyRule.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/DimAssociationAnaInfo.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/DimKpi.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/DimKpiAssociationRelInfo.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/FilterRule.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/QualityRule.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/commonmanage/EWarningCalcResult.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/AccuracyRuleDao.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/DimAssociationAnaInfoDao.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/DimKpiAssociationRelInfoDao.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/DimKpiDao.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/FilterRuleDao.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/QualityRuleDao.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/commonmanage/APPEWarningDetailDao.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/commonmanage/EWarningCalcResultDao.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/service/analysissupport/AccuracyRuleService.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/service/analysissupport/DimKpiService.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/service/analysissupport/FilterRuleService.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/service/analysissupport/QualityRuleService.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/service/monitoroperation/AssociateDiagosisConfigurationService.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/analysissupport/FilterRuleConfigurationController.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/analysissupport/FilterRuleMaintainController.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/analysissupport/FilterRuleResultController.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/analysissupport/QualityRuleResultController.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/monitoroperation/AssociateDiagosisConfigurationController.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/monitoroperation/AssociateDiagosisDetailController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/CmszMonitorAnalysis.war" afterPath="$PROJECT_DIR$/CmszMonitorAnalysis.war" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CmszMonitorAnalysis.war" afterPath="$PROJECT_DIR$/CmszMonitorAnalysis.war" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/Kpi.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/Kpi.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/KpiDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/KpiDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/ProvinceDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/ProvinceDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/commonmanage/TaskManageController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/commonmanage/TaskManageController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Business.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Business.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Channel.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Channel.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/DataSource.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/DataSource.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/commonmanage/RunTask.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/commonmanage/RunTask.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ModelParameterDao.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ModelParameterDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/commonmanage/TaskManageController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/commonmanage/TaskManageController.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$/CmszMonitorAnalysis.iml" afterPath="$PROJECT_DIR$/CmszMonitorAnalysis.iml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java" />
</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/" />
...@@ -64,51 +25,21 @@ ...@@ -64,51 +25,21 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="TaskManageController.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="282" column="0" lean-forward="false" selection-start-line="282" selection-start-column="0" selection-end-line="282" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
<element signature="method#submitTaskFrame#0;class#TaskManageController#0" expanded="false" />
<element signature="method#taskDeleteFrame#0;class#TaskManageController#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="RunTaskForm.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="142" column="31" lean-forward="false" selection-start-line="142" selection-start-column="31" selection-end-line="142" selection-end-column="31" />
<folding>
<element signature="n#c:forEach#0;n#jsp:root#0;n#!!top" expanded="false" />
<element signature="n#c:forEach#1;n#jsp:root#0;n#!!top" expanded="false" />
<element signature="n#c:forEach#2;n#jsp:root#0;n#!!top" expanded="false" />
<element signature="n#c:forEach#3;n#jsp:root#0;n#!!top" expanded="false" />
<element signature="n#c:forEach#7;n#jsp:root#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="QualityRuleMaintainController.java" pinned="false" current-in-tab="false"> <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"> <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="250"> <state relative-caret-position="4422">
<caret line="245" column="49" lean-forward="false" selection-start-line="245" selection-start-column="49" selection-end-line="245" selection-end-column="49" /> <caret line="245" column="49" lean-forward="false" selection-start-line="245" selection-start-column="49" selection-end-line="245" selection-end-column="49" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="validation.js" pinned="false" current-in-tab="false"> <file leaf-file-name="QualityRuleResultController.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/validation.js"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2464"> <state relative-caret-position="197">
<caret line="112" column="18" lean-forward="false" selection-start-line="112" selection-start-column="11" selection-end-line="112" selection-end-column="18" /> <caret line="212" column="35" lean-forward="false" selection-start-line="212" selection-start-column="35" selection-end-line="212" selection-end-column="35" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -127,8 +58,6 @@ ...@@ -127,8 +58,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>taskId</find>
<find>kpiId</find>
<find>provinceId</find> <find>provinceId</find>
<find>provinceView</find> <find>provinceView</find>
<find>channelStatus</find> <find>channelStatus</find>
...@@ -157,6 +86,8 @@ ...@@ -157,6 +86,8 @@
<find>\n</find> <find>\n</find>
<find>submitForm</find> <find>submitForm</find>
<find>addTr</find> <find>addTr</find>
<find>AnalysisSupport/QualityRuleResult</find>
<find>findAccuracy</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>InsideXcdWorkingOrderInfoView</replace> <replace>InsideXcdWorkingOrderInfoView</replace>
...@@ -179,7 +110,6 @@ ...@@ -179,7 +110,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/main/webapp/static/js/commonutils.js" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoT.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoT.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoService.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoVieDao.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoVieDao.java" />
...@@ -230,6 +160,7 @@ ...@@ -230,6 +160,7 @@
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.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/web/analysissupport/QualityRuleResultController.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -274,9 +205,9 @@ ...@@ -274,9 +205,9 @@
</treeState> </treeState>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="386" /> <option name="x" value="-8" />
<option name="y" value="83" /> <option name="y" value="-8" />
<option name="width" value="1370" /> <option name="width" value="1380" />
<option name="height" value="744" /> <option name="height" value="744" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
...@@ -295,6 +226,8 @@ ...@@ -295,6 +226,8 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -318,62 +251,40 @@ ...@@ -318,62 +251,40 @@
<item name="trunk" type="462c0819:PsiDirectoryNode" /> <item name="trunk" 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" /> <item name="webapp" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" 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="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" 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>
<path> <path>
<item name="trunk" type="b2602c69:ProjectViewProjectNode" /> <item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" type="462c0819:PsiDirectoryNode" /> <item name="trunk" 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" /> <item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" /> <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="cmsz" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="trunk" type="b2602c69:ProjectViewProjectNode" /> <item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" type="462c0819:PsiDirectoryNode" /> <item name="trunk" 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" /> <item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" /> <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="cmsz" type="462c0819:PsiDirectoryNode" /> <item name="views" type="462c0819:PsiDirectoryNode" />
<item name="web" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="trunk" type="b2602c69:ProjectViewProjectNode" /> <item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" type="462c0819:PsiDirectoryNode" /> <item name="trunk" 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" /> <item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" /> <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="cmsz" type="462c0819:PsiDirectoryNode" /> <item name="views" type="462c0819:PsiDirectoryNode" />
<item name="web" type="462c0819:PsiDirectoryNode" /> <item name="error" type="462c0819:PsiDirectoryNode" />
<item name="analysissupport" type="462c0819:PsiDirectoryNode" />
</path> </path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scratches" />
<pane id="PackagesPane" /> <pane id="PackagesPane" />
<pane id="Scope" />
<pane id="AndroidView" /> <pane id="AndroidView" />
</panes> </panes>
</component> </component>
...@@ -383,7 +294,7 @@ ...@@ -383,7 +294,7 @@
<property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" /> <property name="project.structure.side.proportion" value="0.2" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../apache-tomcat-7.0.47/lib/servlet-api.jar!/" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="settings.editor.selected.configurable" value="preferences.externalDependencies" /> <property name="settings.editor.selected.configurable" value="preferences.externalDependencies" />
<property name="ignore_missing_gitignore" value="true" /> <property name="ignore_missing_gitignore" value="true" />
<property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/代码/智能分析平台/CmszMonitorAnalysis/trunk/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java&#10;afe&#9;PSI&#9;JAVA://org.apache.fop.afp.AFPEventProducer&#10;hea&#9;FILE&#9;file://D:/代码/智能分析平台/CmszMonitorAnalysis/trunk/src/main/webapp/WEB-INF/layouts/header.jsp" /> <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/代码/智能分析平台/CmszMonitorAnalysis/trunk/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java&#10;afe&#9;PSI&#9;JAVA://org.apache.fop.afp.AFPEventProducer&#10;hea&#9;FILE&#9;file://D:/代码/智能分析平台/CmszMonitorAnalysis/trunk/src/main/webapp/WEB-INF/layouts/header.jsp" />
...@@ -630,7 +541,9 @@ ...@@ -630,7 +541,9 @@
<workItem from="1511782876195" duration="4401000" /> <workItem from="1511782876195" duration="4401000" />
<workItem from="1511839089264" duration="2725000" /> <workItem from="1511839089264" duration="2725000" />
<workItem from="1511851026158" duration="149000" /> <workItem from="1511851026158" duration="149000" />
<workItem from="1511851858871" duration="253000" /> <workItem from="1511851858871" duration="3022000" />
<workItem from="1512030076805" duration="629000" />
<workItem from="1512092497927" duration="17000" />
</task> </task>
<task id="LOCAL-00001" summary="first commit"> <task id="LOCAL-00001" summary="first commit">
<created>1507828551888</created> <created>1507828551888</created>
...@@ -709,11 +622,18 @@ ...@@ -709,11 +622,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1511514153214</updated> <updated>1511514153214</updated>
</task> </task>
<option name="localTasksCounter" value="12" /> <task id="LOCAL-00012" summary="Merge remote-tracking branch 'monitorAnalysis/liuna'&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ChannelDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/BusinessService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$1.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$2.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$3.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$4.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class">
<created>1511852114921</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1511852114921</updated>
</task>
<option name="localTasksCounter" value="13" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="292258000" /> <option name="totallyTimeSpent" value="295673000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -736,20 +656,19 @@ ...@@ -736,20 +656,19 @@
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="true" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="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.39802632" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39802632" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32837838" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32837838" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32072368" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="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="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" 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="true" show_stripe_button="true" weight="0.66611844" 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.27467105" sideWeight="0.49545455" order="12" 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.27467105" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.66611844" sideWeight="0.4939394" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" /> <window_info id="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.24848485" 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.25227273" 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="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="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
...@@ -759,6 +678,7 @@ ...@@ -759,6 +678,7 @@
<window_info id="Message" 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="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32072368" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout> </layout>
...@@ -883,13 +803,6 @@ ...@@ -883,13 +803,6 @@
</buildFile> </buildFile>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/artDialog4.1.7/_doc/highlight/readme.eng.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="131" column="0" lean-forward="false" selection-start-line="131" selection-start-column="0" selection-end-line="131" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WarnAnalysisController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WarnAnalysisController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194"> <state relative-caret-position="194">
...@@ -1117,7 +1030,6 @@ ...@@ -1117,7 +1030,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="406"> <state relative-caret-position="406">
<caret line="146" column="11" lean-forward="false" selection-start-line="146" selection-start-column="11" selection-end-line="146" selection-end-column="11" /> <caret line="146" column="11" lean-forward="false" selection-start-line="146" selection-start-column="11" selection-end-line="146" selection-end-column="11" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1146,7 +1058,6 @@ ...@@ -1146,7 +1058,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-66"> <state relative-caret-position="-66">
<caret line="24" column="13" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" /> <caret line="24" column="13" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1189,10 +1100,6 @@ ...@@ -1189,10 +1100,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-13"> <state relative-caret-position="-13">
<caret line="83" column="19" lean-forward="false" selection-start-line="83" selection-start-column="14" selection-end-line="83" selection-end-column="19" /> <caret line="83" column="19" lean-forward="false" selection-start-line="83" selection-start-column="14" selection-end-line="83" selection-end-column="19" />
<folding>
<marker date="1511832638212" expanded="true" signature="2688:2744" ph="..." />
<marker date="1511832638212" expanded="true" signature="2972:2983" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1222,15 +1129,6 @@ ...@@ -1222,15 +1129,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198"> <state relative-caret-position="198">
<caret line="48" column="14" lean-forward="true" selection-start-line="48" selection-start-column="14" selection-end-line="48" selection-end-column="14" /> <caret line="48" column="14" lean-forward="true" selection-start-line="48" selection-start-column="14" selection-end-line="48" selection-end-column="14" />
<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="250">
<caret line="245" column="49" lean-forward="false" selection-start-line="245" selection-start-column="49" selection-end-line="245" selection-end-column="49" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1268,6 +1166,22 @@ ...@@ -1268,6 +1166,22 @@
</state> </state>
</provider> </provider>
</entry> </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="4422">
<caret line="245" column="49" lean-forward="false" selection-start-line="245" selection-start-column="49" selection-end-line="245" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="197">
<caret line="212" column="35" lean-forward="false" selection-start-line="212" selection-start-column="35" selection-end-line="212" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>
......
No preview for this file type
...@@ -203,7 +203,7 @@ public class QualityRuleResultController { ...@@ -203,7 +203,7 @@ public class QualityRuleResultController {
} }
//查看准确性规则内容 //查看准确性规则内容
@RequestMapping(value = "/findAccuracy*",method = RequestMethod.GET) @RequestMapping(value = "/findAccuracy*")
@ResponseBody @ResponseBody
public void findAccuracy( public void findAccuracy(
@RequestParam(value = "qualityRuleId") String qualityRuleId, @RequestParam(value = "qualityRuleId") String qualityRuleId,
......
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