Skip to content

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

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

--质量报告页面点击详情修改
parent 8f0fbc42
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 172 deletions
.idea/workspace.xml
View file @ dcbc0bea
...@@ -7,9 +7,10 @@ ...@@ -7,9 +7,10 @@
</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$/src/main/java/com/hp/cmsz/repository/QualityRuleReportInfoDao.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleReportInfoService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/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/entity/QualityRuleOperationDetail.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleOperationDetail.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/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/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java" />
</list> </list>
<ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" /> <ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
...@@ -36,16 +37,6 @@ ...@@ -36,16 +37,6 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="QualityRuleReport.jsp" pinned="false" current-in-tab="false">
<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="174">
<caret line="99" column="68" lean-forward="false" selection-start-line="99" selection-start-column="68" selection-end-line="99" selection-end-column="68" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="FilterRuleResult.jsp" pinned="false" current-in-tab="false"> <file leaf-file-name="FilterRuleResult.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -81,80 +72,61 @@ ...@@ -81,80 +72,61 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="QualityRuleReportController.java" pinned="false" current-in-tab="true"> <file leaf-file-name="QualityRuleReportController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="127"> <state relative-caret-position="267">
<caret line="179" column="57" lean-forward="false" selection-start-line="179" selection-start-column="57" selection-end-line="179" selection-end-column="57" /> <caret line="176" column="29" lean-forward="false" selection-start-line="176" selection-start-column="29" selection-end-line="176" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="QualityRuleInfoService.java" pinned="false" current-in-tab="false">
<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="193">
<caret line="51" column="33" lean-forward="false" selection-start-line="51" selection-start-column="33" selection-end-line="51" selection-end-column="33" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="QualityRuleReport.java" pinned="false" current-in-tab="false"> <file leaf-file-name="QualityRuleOperationDetail.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleReport.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleOperationDetail.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193"> <state relative-caret-position="1021">
<caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" /> <caret line="84" column="4" lean-forward="false" selection-start-line="84" selection-start-column="4" selection-end-line="90" selection-end-column="7" />
<folding /> <folding>
<element signature="imports" expanded="true" />
<element signature="e#4130#4131#0" expanded="true" />
<element signature="e#4163#4164#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="FilterRuleConfigurationController.java" pinned="false" current-in-tab="false"> <file leaf-file-name="QualityRuleReportInfoDao.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleConfigurationController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleReportInfoDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2457"> <state relative-caret-position="220">
<caret line="31" column="13" lean-forward="false" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" /> <caret line="10" column="101" lean-forward="false" selection-start-line="10" selection-start-column="101" selection-end-line="10" selection-end-column="101" />
<folding /> <folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="QualityRuleInfoDao.java" pinned="false" current-in-tab="false"> <file leaf-file-name="QualityRuleReportInfoService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleInfoDao.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleReportInfoService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147"> <state relative-caret-position="139">
<caret line="22" column="0" lean-forward="true" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" /> <caret line="9" column="26" lean-forward="true" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="QualityRuleOperationDetail.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleOperationDetail.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="106">
<caret line="180" column="33" lean-forward="false" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#4147#4148#0" expanded="true" />
<element signature="e#4197#4198#0" expanded="true" />
<element signature="e#4241#4242#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
<list> <list>
<option value="Tag Library Descriptor" /> <option value="Tag Library Descriptor" />
<option value="Interface" />
<option value="JavaScript File" /> <option value="JavaScript File" />
<option value="Jsp File" /> <option value="Jsp File" />
<option value="Interface" />
<option value="Class" /> <option value="Class" />
</list> </list>
</option> </option>
...@@ -213,8 +185,6 @@ ...@@ -213,8 +185,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/QualityRule_IfFilter.tag.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleInfo.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleView.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleView.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleViewService.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleViewService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java" />
...@@ -256,7 +226,6 @@ ...@@ -256,7 +226,6 @@
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/QualityReportType.tag" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/QualityReportType.tag" />
<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/QualityRuleConfigurationController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleInfo.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleInfo.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleOperationDetail.java" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/ruleReportDetailTable.js" /> <option value="$PROJECT_DIR$/src/main/webapp/static/js/ruleReportDetailTable.js" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/filterResultDetailTable.js" /> <option value="$PROJECT_DIR$/src/main/webapp/static/js/filterResultDetailTable.js" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp" />
...@@ -264,6 +233,9 @@ ...@@ -264,6 +233,9 @@
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleInfoDao.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleInfoDao.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/service/analysissupport/QualityRuleInfoService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleReportInfoDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleReportInfoService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleOperationDetail.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -357,62 +329,7 @@ ...@@ -357,62 +329,7 @@
<item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" /> <item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<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" />
</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>
<item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
<item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
<item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" /> <item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
<item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
<item name="AnalysisSupport" type="462c0819:PsiDirectoryNode" />
</path> </path>
</expand> </expand>
<select /> <select />
...@@ -833,11 +750,18 @@ ...@@ -833,11 +750,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1512986006951</updated> <updated>1512986006951</updated>
</task> </task>
<option name="localTasksCounter" value="23" /> <task id="LOCAL-00023" summary="2017年12月4日 智能分析平台提交内容&#10; --质量报告页面点击详情更换视图">
<created>1513042121411</created>
<option name="number" value="00023" />
<option name="presentableId" value="LOCAL-00023" />
<option name="project" value="LOCAL" />
<updated>1513042121411</updated>
</task>
<option name="localTasksCounter" value="24" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="592827000" /> <option name="totallyTimeSpent" value="598013000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -868,11 +792,11 @@ ...@@ -868,11 +792,11 @@
<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="9" 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="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="8" 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="8" 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.5229508" 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.45409837" 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.757377" 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.757377" 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.32840723" 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.32840723" 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="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2375189" 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.1732224" 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="3" 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="3" 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="7" 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="7" side_tool="false" content_ui="tabs" />
...@@ -982,7 +906,8 @@ ...@@ -982,7 +906,8 @@
<MESSAGE value="2017年12月4日 智能分析平台提交内容&#10; --数据质量核查下质量规则报告页面" /> <MESSAGE value="2017年12月4日 智能分析平台提交内容&#10; --数据质量核查下质量规则报告页面" />
<MESSAGE value="2017年12月4日 智能分析平台提交内容&#10; --数据质量核查下质量规则运营页面数据展示改为一天" /> <MESSAGE value="2017年12月4日 智能分析平台提交内容&#10; --数据质量核查下质量规则运营页面数据展示改为一天" />
<MESSAGE value="2017年12月4日 智能分析平台提交内容&#10; --数据质量核查下质量规则运营页面数据修改" /> <MESSAGE value="2017年12月4日 智能分析平台提交内容&#10; --数据质量核查下质量规则运营页面数据修改" />
<option name="LAST_COMMIT_MESSAGE" value="2017年12月4日 智能分析平台提交内容&#10; --数据质量核查下质量规则运营页面数据修改" /> <MESSAGE value="2017年12月4日 智能分析平台提交内容&#10; --质量报告页面点击详情更换视图" />
<option name="LAST_COMMIT_MESSAGE" value="2017年12月4日 智能分析平台提交内容&#10; --质量报告页面点击详情更换视图" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -1003,22 +928,6 @@ ...@@ -1003,22 +928,6 @@
</buildFile> </buildFile>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<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="249">
<caret line="275" column="105" lean-forward="false" selection-start-line="275" selection-start-column="105" selection-end-line="275" selection-end-column="121" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/TSWBAnalysisController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="95" column="46" lean-forward="false" selection-start-line="95" selection-start-column="46" selection-end-line="95" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/TSWB_FocusData.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/TSWB_FocusData.java">
<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">
...@@ -1398,19 +1307,6 @@ ...@@ -1398,19 +1307,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleOperationDetail.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="106">
<caret line="180" column="33" lean-forward="false" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#4147#4148#0" expanded="true" />
<element signature="e#4197#4198#0" expanded="true" />
<element signature="e#4241#4242#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/RuleOperationTable.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="24"> <state relative-caret-position="24">
...@@ -1510,54 +1406,84 @@ ...@@ -1510,54 +1406,84 @@
</state> </state>
</provider> </provider>
</entry> </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="-2457">
<caret line="31" column="13" lean-forward="false" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" />
<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="32" column="194" lean-forward="true" selection-start-line="32" selection-start-column="4" selection-end-line="32" selection-end-column="194" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleReport.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleReport.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193"> <state relative-caret-position="106">
<caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" /> <caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleConfigurationController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2457"> <state relative-caret-position="220">
<caret line="31" column="13" lean-forward="false" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" /> <caret line="53" column="5" lean-forward="false" selection-start-line="51" selection-start-column="3" selection-end-line="53" selection-end-column="5" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </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/repository/QualityRuleReportInfoDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="567"> <state relative-caret-position="220">
<caret line="157" column="57" lean-forward="true" selection-start-line="157" selection-start-column="57" selection-end-line="157" selection-end-column="57" /> <caret line="10" column="101" lean-forward="false" selection-start-line="10" selection-start-column="101" selection-end-line="10" selection-end-column="101" />
<folding /> <folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleInfoDao.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleReportInfoService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147"> <state relative-caret-position="139">
<caret line="22" column="0" lean-forward="true" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" /> <caret line="9" column="26" lean-forward="true" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleOperationController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193"> <state relative-caret-position="567">
<caret line="51" column="33" lean-forward="false" selection-start-line="51" selection-start-column="33" selection-end-line="51" selection-end-column="33" /> <caret line="157" column="57" lean-forward="true" selection-start-line="157" selection-start-column="57" selection-end-line="157" selection-end-column="57" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="127"> <state relative-caret-position="267">
<caret line="179" column="57" lean-forward="false" selection-start-line="179" selection-start-column="57" selection-end-line="179" selection-end-column="57" /> <caret line="176" column="29" lean-forward="false" selection-start-line="176" selection-start-column="29" selection-end-line="176" selection-end-column="29" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleOperationDetail.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1021">
<caret line="84" column="4" lean-forward="false" selection-start-line="84" selection-start-column="4" selection-end-line="90" selection-end-column="7" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#4130#4131#0" expanded="true" />
<element signature="e#4163#4164#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>
......
src/main/java/com/hp/cmsz/entity/QualityRuleOperationDetail.java
View file @ dcbc0bea
...@@ -18,7 +18,7 @@ public class QualityRuleOperationDetail { ...@@ -18,7 +18,7 @@ public class QualityRuleOperationDetail {
private Long channelId; private Long channelId;
private Long dataSourceId; private Long dataSourceId;
private Long provinceId; private Long provinceId;
private Long qualityVerificationResultId; //private Long qualityVerificationResultId;
private Timestamp kpiMonitorRunTime; private Timestamp kpiMonitorRunTime;
private Timestamp businessTime; private Timestamp businessTime;
private String kpiName; private String kpiName;
...@@ -82,13 +82,13 @@ public class QualityRuleOperationDetail { ...@@ -82,13 +82,13 @@ public class QualityRuleOperationDetail {
} }
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy= GenerationType.IDENTITY)
public Long getQualityVerificationResultId() { // public Long getQualityVerificationResultId() {
return qualityVerificationResultId; // return qualityVerificationResultId;
} // }
//
public void setQualityVerificationResultId(Long qualityVerificationResultId) { // public void setQualityVerificationResultId(Long qualityVerificationResultId) {
this.qualityVerificationResultId = qualityVerificationResultId; // this.qualityVerificationResultId = qualityVerificationResultId;
} // }
public Timestamp getKpiMonitorRunTime() { public Timestamp getKpiMonitorRunTime() {
return kpiMonitorRunTime; return kpiMonitorRunTime;
......
src/main/java/com/hp/cmsz/repository/QualityRuleReportInfoDao.java 0 → 100644
View file @ dcbc0bea
package com.hp.cmsz.repository;
import com.hp.cmsz.entity.QualityRuleOperationDetail;
import com.hp.cmsz.entity.QualityRuleReport;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.sql.Timestamp;
import java.util.List;
public interface QualityRuleReportInfoDao extends JpaSpecificationExecutor<QualityRuleOperationDetail>,
PagingAndSortingRepository<QualityRuleOperationDetail, Long> {
List<QualityRuleOperationDetail> findByProvinceIdAndKpiIdAndBusinessTimeBetweenOrderByBusinessTimeDescProvinceIdDescWarningNumAsc(Long provinceId, Long kpiId, Timestamp startTime, Timestamp endTime);
}
src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleReportInfoService.java 0 → 100644
View file @ dcbc0bea
package com.hp.cmsz.service.analysissupport;
import com.hp.cmsz.entity.QualityRuleOperationDetail;
import com.hp.cmsz.entity.QualityRuleReport;
import com.hp.cmsz.repository.QualityRuleReportInfoDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.sql.Timestamp;
import java.util.List;
@Service
@Transactional
public class QualityRuleReportInfoService {
@Autowired
private QualityRuleReportInfoDao qualityRuleReportInfoDao;
public List<QualityRuleOperationDetail> findBy(Long provinceId, Long kpiId, Timestamp startTime, Timestamp endTime){
return qualityRuleReportInfoDao.findByProvinceIdAndKpiIdAndBusinessTimeBetweenOrderByBusinessTimeDescProvinceIdDescWarningNumAsc(provinceId,kpiId,startTime,endTime);
}
}
src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleReportController.java
View file @ dcbc0bea
...@@ -5,10 +5,12 @@ import com.hp.cmsz.entity.*; ...@@ -5,10 +5,12 @@ import com.hp.cmsz.entity.*;
import com.hp.cmsz.repository.DataSourceDao; import com.hp.cmsz.repository.DataSourceDao;
import com.hp.cmsz.repository.KpiDao; import com.hp.cmsz.repository.KpiDao;
import com.hp.cmsz.repository.ProvinceDao; import com.hp.cmsz.repository.ProvinceDao;
import com.hp.cmsz.repository.QualityRuleReportInfoDao;
import com.hp.cmsz.service.BusinessService; import com.hp.cmsz.service.BusinessService;
import com.hp.cmsz.service.ChannelService; import com.hp.cmsz.service.ChannelService;
import com.hp.cmsz.service.CmszOperationLogService; import com.hp.cmsz.service.CmszOperationLogService;
import com.hp.cmsz.service.analysissupport.QualityRuleInfoService; import com.hp.cmsz.service.analysissupport.QualityRuleInfoService;
import com.hp.cmsz.service.analysissupport.QualityRuleReportInfoService;
import com.hp.cmsz.service.analysissupport.QualityRuleReportService; import com.hp.cmsz.service.analysissupport.QualityRuleReportService;
import com.hp.cmsz.web.PageURLController; import com.hp.cmsz.web.PageURLController;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -60,6 +62,9 @@ public class QualityRuleReportController { ...@@ -60,6 +62,9 @@ public class QualityRuleReportController {
private QualityRuleInfoService qualityRuleInfoService; private QualityRuleInfoService qualityRuleInfoService;
@Autowired @Autowired
private QualityRuleReportInfoService qualityRuleReportInfoService;
@Autowired
private CmszOperationLogService cmszOperationLogService; private CmszOperationLogService cmszOperationLogService;
@RequestMapping(value = "") @RequestMapping(value = "")
...@@ -169,7 +174,7 @@ public class QualityRuleReportController { ...@@ -169,7 +174,7 @@ public class QualityRuleReportController {
Long kpi = Long.parseLong(kpiId); Long kpi = Long.parseLong(kpiId);
Timestamp startTime = Timestamp.valueOf(reportSumStartTime); Timestamp startTime = Timestamp.valueOf(reportSumStartTime);
Timestamp endTime =Timestamp.valueOf(reportSumEndTime); Timestamp endTime =Timestamp.valueOf(reportSumEndTime);
List<QualityRuleReport> qualityRuleReportList = qualityRuleInfoService.findBy(province,kpi,startTime,endTime); List<QualityRuleOperationDetail> qualityRuleReportList = qualityRuleReportInfoService.findBy(province,kpi,startTime,endTime);
cmszOperationLogService.createLog("查询","数据质量规则运营","查询数据质量运营明细"); cmszOperationLogService.createLog("查询","数据质量规则运营","查询数据质量运营明细");
Gson gson = new Gson(); Gson gson = new Gson();
response.setContentType("text/Xml;charset=gbk"); response.setContentType("text/Xml;charset=gbk");
......
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