Skip to content

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

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

--数据质量核查下质量规则新增页面弹出窗口
parent 1ba4a8ac
Show whitespace changes
Inline Side-by-side
Showing with 89 additions and 110 deletions
.idea/workspace.xml
View file @ 3f1e7665
......@@ -8,15 +8,12 @@
<component name="ChangeListManager">
<list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRule.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleConfiguration.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleConfiguration.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/ruleResultDetailTable.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/ruleResultDetailTable.js" />
</list>
<ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -35,7 +32,7 @@
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleConfiguration.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23">
<caret line="570" column="10" lean-forward="true" selection-start-line="570" selection-start-column="10" selection-end-line="570" selection-end-column="10" />
<caret line="271" column="40" lean-forward="false" selection-start-line="271" selection-start-column="40" selection-end-line="271" selection-end-column="40" />
<folding />
</state>
</provider>
......@@ -44,8 +41,8 @@
<file leaf-file-name="QualityRuleMaintain.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="102" column="54" lean-forward="true" selection-start-line="102" selection-start-column="54" selection-end-line="102" selection-end-column="67" />
<state relative-caret-position="132">
<caret line="266" column="34" lean-forward="true" selection-start-line="266" selection-start-column="34" selection-end-line="266" selection-end-column="34" />
<folding />
</state>
</provider>
......@@ -54,7 +51,7 @@
<file leaf-file-name="ModelResult.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<state relative-caret-position="2244">
<caret line="102" column="64" lean-forward="false" selection-start-line="102" selection-start-column="64" selection-end-line="102" selection-end-column="64" />
<folding />
</state>
......@@ -64,28 +61,38 @@
<file leaf-file-name="QualityRuleMaintainController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-571">
<caret line="257" column="61" lean-forward="false" selection-start-line="257" selection-start-column="61" selection-end-line="257" selection-end-column="69" />
<state relative-caret-position="125">
<caret line="170" column="106" lean-forward="false" selection-start-line="170" selection-start-column="106" selection-end-line="170" selection-end-column="106" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ModelParameterConfigurationController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.java">
<file leaf-file-name="QualityRuleConfigurationController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2011">
<caret line="246" column="5" lean-forward="true" selection-start-line="246" selection-start-column="5" selection-end-line="246" selection-end-column="5" />
<state relative-caret-position="191">
<caret line="179" column="9" lean-forward="true" selection-start-line="179" selection-start-column="9" selection-end-line="179" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="QualityRuleConfigurationController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.java">
<file leaf-file-name="KpiDao.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="185">
<caret line="46" column="45" lean-forward="false" selection-start-line="46" selection-start-column="45" selection-end-line="46" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Kpi.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Kpi.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="339">
<caret line="313" column="5" lean-forward="true" selection-start-line="313" selection-start-column="5" selection-end-line="313" selection-end-column="5" />
<state relative-caret-position="127">
<caret line="27" column="13" lean-forward="false" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
<folding />
</state>
</provider>
......@@ -94,7 +101,7 @@
<file leaf-file-name="QualityRuleService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="169">
<state relative-caret-position="528">
<caret line="30" column="111" lean-forward="false" selection-start-line="30" selection-start-column="111" selection-end-line="30" selection-end-column="111" />
<folding />
</state>
......@@ -104,7 +111,7 @@
<file leaf-file-name="QualityRuleDao.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="224">
<state relative-caret-position="572">
<caret line="36" column="43" lean-forward="false" selection-start-line="36" selection-start-column="43" selection-end-line="36" selection-end-column="43" />
<folding />
</state>
......@@ -195,7 +202,6 @@
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/AccuracyRule.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ProvinceDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/DataModelViewDao.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/QualityRule_IfFilter.tag.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/PageURLController.java" />
......@@ -222,11 +228,12 @@
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/ruleResultDetailTable.js" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRule.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleConfiguration.jsp" />
</list>
</option>
......@@ -280,8 +287,6 @@
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -352,6 +357,8 @@
<select />
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="AndroidView" />
</panes>
</component>
......@@ -609,7 +616,8 @@
<workItem from="1512294466328" duration="5666000" />
<workItem from="1512350521369" duration="14271000" />
<workItem from="1512374931393" duration="1843000" />
<workItem from="1512377518719" duration="6376000" />
<workItem from="1512377518719" duration="6434000" />
<workItem from="1512436761058" duration="985000" />
</task>
<task id="LOCAL-00001" summary="first commit">
<created>1507828551888</created>
......@@ -730,11 +738,18 @@
<option name="project" value="LOCAL" />
<updated>1512370327411</updated>
</task>
<option name="localTasksCounter" value="18" />
<task id="LOCAL-00018" summary="2017年12月4日 智能分析平台提交内容&#10; --数据质量核查下质量规则修改页面完成">
<created>1512383950770</created>
<option name="number" value="00018" />
<option name="presentableId" value="LOCAL-00018" />
<option name="project" value="LOCAL" />
<updated>1512383950771</updated>
</task>
<option name="localTasksCounter" value="19" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="476421000" />
<option name="totallyTimeSpent" value="477464000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -765,11 +780,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="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32786885" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.76065576" 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.40983605" sideWeight="0.4939394" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.13934426" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32786885" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23600605" 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.23600605" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="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" />
......@@ -878,7 +893,8 @@
<MESSAGE value="2017年12月2日 智能分析平台提交内容&#10; --数据质量核查下过滤规则页面联动" />
<MESSAGE value="2017年12月3日 智能分析平台提交内容&#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 name="XDebuggerManager">
<breakpoint-manager>
......@@ -907,21 +923,6 @@
</buildFile>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/QualityRule_IfFilter.tag">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="139">
<caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdWarningInfoView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-168">
<caret line="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdWarningInfoViewDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
......@@ -933,10 +934,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5852">
<caret line="549" column="39" lean-forward="false" selection-start-line="549" selection-start-column="39" selection-end-line="549" selection-end-column="57" />
<folding>
<marker date="1511516640337" expanded="true" signature="47293:47349" ph="..." />
<marker date="1511516640337" expanded="true" signature="47572:47583" ph="..." />
</folding>
</state>
</provider>
</entry>
......@@ -944,9 +941,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="200" column="41" lean-forward="false" selection-start-line="200" selection-start-column="41" selection-end-line="200" selection-end-column="55" />
<folding>
<marker date="1511516640327" expanded="true" signature="13862:13918" ph="..." />
</folding>
</state>
</provider>
</entry>
......@@ -989,7 +983,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="864">
<caret line="202" column="33" lean-forward="false" selection-start-line="202" selection-start-column="33" selection-end-line="202" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
......@@ -1004,7 +997,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1151">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -1075,10 +1067,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="263" column="12" lean-forward="false" selection-start-line="263" selection-start-column="12" selection-end-line="263" selection-end-column="12" />
<folding>
<marker date="1511516952446" expanded="true" signature="10247:10253" ph="&amp;nbsp;" />
<marker date="1511516952446" expanded="true" signature="10253:10259" ph="&amp;nbsp;" />
</folding>
</state>
</provider>
</entry>
......@@ -1121,7 +1109,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2366">
<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>
......@@ -1171,7 +1158,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="57" column="13" lean-forward="false" selection-start-line="57" selection-start-column="13" selection-end-line="57" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -1179,7 +1165,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1254">
<caret line="102" column="0" lean-forward="false" selection-start-line="102" selection-start-column="0" selection-end-line="102" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -1194,10 +1179,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1188">
<caret line="54" column="32" lean-forward="false" selection-start-line="54" selection-start-column="32" selection-end-line="54" selection-end-column="32" />
<folding>
<marker date="1511516640315" expanded="true" signature="12804:12810" ph="&amp;nbsp;" />
<marker date="1511516640315" expanded="true" signature="12810:12816" ph="&amp;nbsp;" />
</folding>
</state>
</provider>
</entry>
......@@ -1205,16 +1186,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1298">
<caret line="138" column="18" lean-forward="false" selection-start-line="138" selection-start-column="18" selection-end-line="138" selection-end-column="18" />
<folding>
<element signature="e#3250#3251#0" expanded="true" />
<element signature="e#3278#3279#0" expanded="true" />
<element signature="e#3333#3334#0" expanded="true" />
<element signature="e#3376#3377#0" expanded="true" />
<element signature="e#3411#3412#0" expanded="true" />
<element signature="e#3438#3439#0" expanded="true" />
<element signature="e#3491#3492#0" expanded="true" />
<element signature="e#3532#3533#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -1222,10 +1193,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1672">
<caret line="537" column="96" lean-forward="false" selection-start-line="537" selection-start-column="96" selection-end-line="537" selection-end-column="96" />
<folding>
<marker date="1512375621300" expanded="true" signature="10988:11000" ph="..." />
<marker date="1512375621300" expanded="true" signature="15330:15340" ph="..." />
</folding>
</state>
</provider>
</entry>
......@@ -1233,10 +1200,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="301">
<caret line="578" column="84" lean-forward="false" selection-start-line="578" selection-start-column="84" selection-end-line="578" selection-end-column="84" />
<folding>
<marker date="1511516671157" expanded="true" signature="11810:11822" ph="..." />
<marker date="1511516671157" expanded="true" signature="16324:16334" ph="..." />
</folding>
</state>
</provider>
</entry>
......@@ -1244,29 +1207,20 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147">
<caret line="186" column="20" lean-forward="true" selection-start-line="186" selection-start-column="20" selection-end-line="186" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<state relative-caret-position="2244">
<caret line="102" column="64" lean-forward="false" selection-start-line="102" selection-start-column="64" selection-end-line="102" selection-end-column="64" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="102" column="54" lean-forward="true" selection-start-line="102" selection-start-column="54" selection-end-line="102" selection-end-column="67" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="224">
<state relative-caret-position="572">
<caret line="36" column="43" lean-forward="false" selection-start-line="36" selection-start-column="43" selection-end-line="36" selection-end-column="43" />
<folding />
</state>
......@@ -1274,7 +1228,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="169">
<state relative-caret-position="528">
<caret line="30" column="111" lean-forward="false" selection-start-line="30" selection-start-column="111" selection-end-line="30" selection-end-column="111" />
<folding />
</state>
......@@ -1282,24 +1236,48 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2011">
<caret line="246" column="5" lean-forward="true" selection-start-line="246" selection-start-column="5" selection-end-line="246" selection-end-column="5" />
<state relative-caret-position="4488">
<caret line="246" column="5" lean-forward="false" selection-start-line="246" selection-start-column="5" selection-end-line="246" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Kpi.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="127">
<caret line="27" column="13" lean-forward="false" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="185">
<caret line="46" column="45" lean-forward="false" selection-start-line="46" selection-start-column="45" selection-end-line="46" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="339">
<caret line="313" column="5" lean-forward="true" selection-start-line="313" selection-start-column="5" selection-end-line="313" selection-end-column="5" />
<state relative-caret-position="191">
<caret line="179" column="9" lean-forward="true" selection-start-line="179" selection-start-column="9" selection-end-line="179" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-571">
<caret line="257" column="61" lean-forward="false" selection-start-line="257" selection-start-column="61" selection-end-line="257" selection-end-column="69" />
<state relative-caret-position="125">
<caret line="170" column="106" lean-forward="false" selection-start-line="170" selection-start-column="106" selection-end-line="170" selection-end-column="106" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="266" column="34" lean-forward="true" selection-start-line="266" selection-start-column="34" selection-end-line="266" selection-end-column="34" />
<folding />
</state>
</provider>
......@@ -1307,7 +1285,7 @@
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleConfiguration.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23">
<caret line="570" column="10" lean-forward="true" selection-start-line="570" selection-start-column="10" selection-end-line="570" selection-end-column="10" />
<caret line="271" column="40" lean-forward="false" selection-start-line="271" selection-start-column="40" selection-end-line="271" selection-end-column="40" />
<folding />
</state>
</provider>
......
src/main/java/com/hp/cmsz/repository/KpiDao.java
View file @ 3f1e7665
......@@ -44,8 +44,8 @@ public interface KpiDao extends JpaSpecificationExecutor<Kpi>,PagingAndSortingRe
List<Object[]> findAllKpiIdAndKpiNameByBusinessId(@Param("businessIdList") List<Long> businessIdList);
//由业务,采集频率联动得到指标
@Query("select kpi.kpiId, kpi.kpiName from Kpi kpi,Business business where business.businessId = kpi.businessId and kpi.isActive = 'Y' and kpi.calCycle=:calCycleValue and business.businessId in (:businessIds) and kpi.kpiId>=0 order by kpi.kpiId ")
List<Object[]> findKpiIdAndKpiNameByBusinessIds(@Param("businessIds")List<Long> businessIdList, @Param("calCycleValue") String calCycleValue);
@Query("select kpi.kpiId, kpi.kpiName, kpi.kpiCode from Kpi kpi,Business business where business.businessId = kpi.businessId and kpi.isActive = 'Y' and kpi.calCycle=:calCycleValue and business.businessId in (:businessIds) and kpi.kpiId>=0 order by kpi.kpiId ")
List<Object[]> findKpiIdAndKpiNameAndKpiCodeByBusinessIds(@Param("businessIds")List<Long> businessIdList, @Param("calCycleValue") String calCycleValue);
//由单个业务ID得到指标
@Query("select kpi.kpiId, kpi.kpiName from Kpi kpi,Business business where kpi.businessId=business.businessId and business.businessId = :businessIdList and kpi.kpiId >=0")
......
src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.java
View file @ 3f1e7665
......@@ -178,7 +178,7 @@ public class QualityRuleConfigurationController {
for(int i=0;i<strs.length;i++) {
businessIdlist.add(Long.valueOf(strs[i]));
}
List<Object[]> businessKpiList = (List<Object[]>)kpiDao.findKpiIdAndKpiNameByBusinessIds(businessIdlist,calCycleValue);
List<Object[]> businessKpiList = kpiDao.findKpiIdAndKpiNameAndKpiCodeByBusinessIds(businessIdlist,calCycleValue);
Gson gson = new Gson();
response.setContentType("text/Xml;charset=gbk");
......
src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java
View file @ 3f1e7665
......@@ -168,7 +168,7 @@ public class QualityRuleMaintainController {
for(int i=0;i<strs.length;i++) {
businessIdlist.add(Long.valueOf(strs[i]));
}
List<Object[]> businessKpiList = (List<Object[]>)kpiDao.findKpiIdAndKpiNameByBusinessIds(businessIdlist,calCycleValue);
List<Object[]> businessKpiList = (List<Object[]>)kpiDao.findKpiIdAndKpiNameAndKpiCodeByBusinessIds(businessIdlist,calCycleValue);
Gson gson = new Gson();
response.setContentType("text/Xml;charset=gbk");
......
src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleConfiguration.jsp
View file @ 3f1e7665
......@@ -269,7 +269,7 @@
//form表单提交
$("#ruleSubmit").click(function(){
if($.trim($("#kpiMonitorTime").val())==""){
if($.trim($("#frequencyValue").val())==""){
$.alert("指标监控时间不能为空");
}else if($("#businessTime").val()==""){
$.alert("指标业务时间不能为空");
......@@ -441,7 +441,8 @@
td.empty();
data = JSON.parse(data)
data.forEach(function(t){
td.append("<input type='checkbox' name='kpiinput' class='kpiItem' value='"+t[0]+"' >"+t[1]+"</input>")
console.log(data)
td.append("<input type='checkbox' title='kpiCode' name='kpiinput' class='kpiItem' value='"+t[0]+"' >"+t[1]+"</input>")
});
}
});
......
src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp
View file @ 3f1e7665
......@@ -261,7 +261,7 @@ $("#addParam").click(function(){
//form表单提交
$("#ruleSubmit").click(function(){
if($.trim($("#kpiMonitorTimeValue").val())==""){
if($.trim($("#frequencyValue").val())==""){
$.alert("指标监控时间不能为空");
}else if($("#businessTime").val()==""){
$.alert("指标业务时间不能为空");
......
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