Skip to content

C
cmszMonitorAnalysis
Commit c96dd352 authored by 胡斌's avatar 胡斌
Browse files
Options

智能分析平台备份

parent e74ff109
Show whitespace changes
Inline Side-by-side
Showing with 118 additions and 163 deletions
.idea/workspace.xml
View file @ c96dd352
......@@ -7,13 +7,11 @@
</component>
<component name="ChangeListManager">
<list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/CmszMonitorAnalysis.war" afterPath="$PROJECT_DIR$/CmszMonitorAnalysis.war" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/ruleReportDetailTable.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/ruleReportDetailTable.js" />
</list>
<ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
<ignored path="$PROJECT_DIR$/target/" />
......@@ -39,72 +37,7 @@
<select />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="RunTaskForm.jsp" pinned="false" current-in-tab="true">
<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="382">
<caret line="59" column="0" lean-forward="true" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
<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#4;n#jsp:root#0;n#!!top" expanded="false" />
<element signature="e#4529#5399#0#HTML" expanded="false" />
<element signature="e#5470#6238#0#HTML" expanded="false" />
<element signature="n#c:forEach#6;n#jsp:root#0;n#!!top" expanded="false" />
<element signature="e#6904#7008#0#HTML" expanded="false" />
<element signature="e#7044#7146#0#HTML" expanded="false" />
<element signature="e#7182#7283#0#HTML" expanded="false" />
<element signature="e#7319#7422#0#HTML" expanded="false" />
<element signature="e#7507#7598#0#HTML" expanded="false" />
<element signature="e#7642#8531#0#HTML" expanded="false" />
<element signature="e#8586#9454#0#HTML" expanded="false" />
<element signature="e#9502#9587#0#HTML" expanded="false" />
<element signature="e#9636#9684#0#HTML" expanded="false" />
<element signature="e#9748#9820#0#HTML" expanded="false" />
<element signature="e#9845#11600#0#HTML" expanded="false" />
<element signature="e#11630#11937#0#HTML" expanded="false" />
<element signature="e#11969#12339#0#HTML" expanded="false" />
<element signature="e#12379#12563#0#HTML" expanded="false" />
<element signature="e#12593#13906#0#HTML" expanded="false" />
<element signature="e#13931#14098#0#HTML" expanded="false" />
<element signature="e#14124#14297#0#HTML" expanded="false" />
<element signature="e#14323#14402#0#HTML" expanded="false" />
<element signature="e#14429#14508#0#HTML" expanded="false" />
<element signature="e#14531#14795#0#HTML" expanded="false" />
<element signature="e#14831#15280#0#HTML" expanded="false" />
<element signature="e#15305#15787#0#HTML" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="TaskManageController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="206" column="39" lean-forward="false" selection-start-line="206" selection-start-column="32" selection-end-line="206" selection-end-column="39" />
<folding>
<element signature="method#updateStatusFrame#0;class#TaskManageController#0" expanded="false" />
<element signature="method#submitTaskFrame#0;class#TaskManageController#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="RunTask.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="69" column="33" lean-forward="false" selection-start-line="69" selection-start-column="21" selection-end-line="69" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
......@@ -117,8 +50,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>filterResultDetailTable</find>
<find>ajax</find>
<find>FilterConfiguration</find>
<find>filterRuleList</find>
<find>businesstd</find>
......@@ -147,6 +78,8 @@
<find>xcdFindWarningTable</find>
<find>datasourceViewId</find>
<find>taskFormFrame</find>
<find>findOperation</find>
<find>selectOperation</find>
</findStrings>
<replaceStrings>
<replace>InsideXcdWorkingOrderInfoView</replace>
......@@ -177,9 +110,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar!/javax/persistence/ManyToOne.class" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/commonmanage/APPEWarningDetailDao.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/error/500.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/Task.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Channel.java" />
......@@ -228,6 +158,9 @@
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskFormConfiguration.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/QualityRuleReportController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/ruleReportDetailTable.js" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp" />
</list>
</option>
</component>
......@@ -272,9 +205,9 @@
</treeState>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-43" />
<option name="y" value="-10" />
<option name="width" value="1380" />
<option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="1378" />
<option name="height" value="744" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
......@@ -343,6 +276,15 @@
<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="resources" type="462c0819:PsiDirectoryNode" />
</path>
<path>
......@@ -385,7 +327,7 @@
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="TaskManage" type="462c0819:PsiDirectoryNode" />
<item name="AnalysisSupport" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
......@@ -676,7 +618,7 @@
<workItem from="1512816801354" duration="3959000" />
<workItem from="1512826211367" duration="2154000" />
<workItem from="1512828489239" duration="13677000" />
<workItem from="1512852116133" duration="6438000" />
<workItem from="1512852116133" duration="12755000" />
</task>
<task id="LOCAL-00001" summary="first commit">
<created>1507828551888</created>
......@@ -832,11 +774,18 @@
<option name="project" value="LOCAL" />
<updated>1512845976151</updated>
</task>
<option name="localTasksCounter" value="23" />
<task id="LOCAL-00023" summary="智能分析平台备份">
<created>1512896465574</created>
<option name="number" value="00023" />
<option name="presentableId" value="LOCAL-00023" />
<option name="project" value="LOCAL" />
<updated>1512896465574</updated>
</task>
<option name="localTasksCounter" value="24" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="440464000" />
<option name="totallyTimeSpent" value="446781000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -860,7 +809,7 @@
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47685185" 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.50771606" 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.3271605" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31790122" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
......@@ -871,7 +820,7 @@
<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.7623457" sideWeight="0.49167928" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3271605" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2700454" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2677761" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
......@@ -993,7 +942,7 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="73" />
<option name="time" value="76" />
</breakpoint-manager>
<watches-manager>
<configuration name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory">
......@@ -1014,69 +963,6 @@
</buildFile>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/BusinessDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="25" column="34" lean-forward="false" selection-start-line="25" selection-start-column="19" selection-end-line="25" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FilterRule.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="24" column="34" lean-forward="false" selection-start-line="24" selection-start-column="19" selection-end-line="24" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleConfigurationController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="447">
<caret line="153" column="35" lean-forward="false" selection-start-line="153" selection-start-column="35" selection-end-line="153" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/filterResultDetailTable.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="430">
<caret line="340" column="37" lean-forward="false" selection-start-line="340" selection-start-column="37" selection-end-line="340" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleConfiguration.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="24">
<caret line="241" column="76" lean-forward="false" selection-start-line="241" selection-start-column="76" selection-end-line="241" selection-end-column="76" />
<folding>
<marker date="1512699816722" expanded="true" signature="9367:9377" ph="..." />
<marker date="1512699816722" expanded="true" signature="12239:12249" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/TaskDetailForm.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/TaskDetailList.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/TaskDetailListDetail.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/RunTaskDetail.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144">
......@@ -1472,8 +1358,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="382">
<caret line="59" column="0" lean-forward="true" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
<state relative-caret-position="166">
<caret line="50" column="38" lean-forward="true" selection-start-line="50" selection-start-column="38" selection-end-line="50" selection-end-column="38" />
<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" />
......@@ -1509,6 +1395,75 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2918">
<caret line="170" column="0" lean-forward="false" selection-start-line="170" selection-start-column="0" selection-end-line="170" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleReportService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="18" column="104" lean-forward="false" selection-start-line="18" selection-start-column="104" selection-end-line="18" selection-end-column="104" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleReportDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="192">
<caret line="15" column="18" lean-forward="false" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleReport.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-346">
<caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleReport.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288">
<caret line="99" column="63" lean-forward="false" selection-start-line="99" selection-start-column="63" selection-end-line="99" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/ruleReportDetailTable.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-94">
<caret line="546" column="234" lean-forward="false" selection-start-line="546" selection-start-column="234" selection-end-line="546" selection-end-column="234" />
<folding>
<element signature="e#14622#17932#0" expanded="false" />
<element signature="e#17981#18738#0" expanded="false" />
<marker date="1512900228148" expanded="true" signature="12471:12483" ph="..." />
<marker date="1512900228148" expanded="true" signature="17855:17865" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="42" column="24" lean-forward="false" selection-start-line="42" selection-start-column="24" selection-end-line="42" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleOperation.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288">
<caret line="57" column="42" lean-forward="true" selection-start-line="57" selection-start-column="42" selection-end-line="57" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
......
CmszMonitorAnalysis.war
View file @ c96dd352
No preview for this file type
src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java
View file @ c96dd352
......@@ -165,12 +165,11 @@ public class QualityRuleReportController {
@RequestParam(value = "reportSumStartTime") String reportSumStartTime,
@RequestParam(value = "reportSumEndTime") String reportSumEndTime,
HttpServletResponse response) throws ParseException{
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
SimpleDateFormat sdf= new SimpleDateFormat("MMM d, yyyy K:m:s a", Locale.ENGLISH);
Long province = Long.parseLong(provinceId);
Long kpi = Long.parseLong(kpiId);
Timestamp startTime = Timestamp.valueOf(sd.format(sdf.parse(reportSumStartTime)));
Timestamp endTime =Timestamp.valueOf(sd.format(sdf.parse(reportSumEndTime)));
Timestamp startTime = Timestamp.valueOf(reportSumStartTime);
System.out.println(startTime);
Timestamp endTime =Timestamp.valueOf(reportSumEndTime);
List<QualityRuleInfo> qualityRuleInfo = (List<QualityRuleInfo>) qualityRuleInfoService.findBy(province,kpi,startTime,endTime);
cmszOperationLogService.createLog("查询","数据质量规则运营","查询数据质量规则运营明细");
Gson gson = new Gson();
......
src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp
View file @ c96dd352
......@@ -21,7 +21,7 @@
<th width="6.4%">告警类型</th>
<th width="6.4%">指标监控时间</th>
<th width="6.4%">指标业务时间</th>
<th width="6.4%">是否过滤</th>
<%--<th width="6.4%">是否过滤</th>--%>
</tr>
</thead>
<tbody>
......@@ -38,10 +38,10 @@
<td>${qualityRuleInfo.warningType}</td>
<td>${qualityRuleInfo.kpiMonitorRunTime}</td>
<td>${qualityRuleInfo.businessTime}</td>
<td>
<c:if test="${qualityRuleInfo.ifFilter == '0'}">未过滤</c:if>
<c:if test="${qualityRuleInfo.ifFilter == '1'}">已过滤</c:if>
</td>
<%--<td>--%>
<%--<c:if test="${qualityRuleInfo.ifFilter == '0'}">未过滤</c:if>--%>
<%--<c:if test="${qualityRuleInfo.ifFilter == '1'}">已过滤</c:if>--%>
<%--</td>--%>
</tr>
</c:forEach>
</tbody>
......
src/main/webapp/static/js/ruleReportDetailTable.js
View file @ c96dd352
......@@ -331,6 +331,7 @@ table_pagging.prototype = {
}
if(k==1){
console.log(this.objectlist[i])
tdContext = "<a href='javascript:;' onclick='selectOperation(\""+this.getData(this.objectlist[i],"provinceId")+"\",\""+this.getData(this.objectlist[i],"kpiId")+"\",\""+this.getData(this.objectlist[i],"reportSumStartTime")+"\",\""+this.getData(this.objectlist[i],"reportSumEndTime")+"\")'>"+this.getData(this.objectlist[i],this.header[k][1])+"</a>";
}
......@@ -529,7 +530,7 @@ table_pagging.prototype = {
alert(this.tablename);
}
}
};
//查看数据质量运营
function selectOperation(provinceId,kpiId,reportSumStartTime,reportSumEndTime){
$.dialog({
......@@ -543,7 +544,7 @@ function selectOperation(provinceId,kpiId,reportSumStartTime,reportSumEndTime){
$.ajax({
type : 'GET',
contentType : 'application/json',
url: "/AnalysisSupport/QualityRuleReport/findOperation?provinceId="+provinceId+"&kpiId="+kpiId+"&reportSumStartTime="+reportSumStartTime+"&reportSumEndTime="+reportSumEndTime,
url: "/AnalysisSupport/QualityRuleReport/findOperation?provinceId="+provinceId+"&kpiId="+kpiId+"&reportSumStartTime="+df.format(new Date(reportSumStartTime))+"&reportSumEndTime="+df.format(new Date(reportSumStartTime)),
dataType : 'text',
beforeSend: function(data) {
},
......
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