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

--数据质量核查

2017年12月1日智能分析平台提交内容
a061e9dd · liuna · c86ed933 · a061e9dd · a061e9dd · a061e9dd
Commit a061e9dd authored Dec 01, 2017 by liuna
13 changed files
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,19 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="2017年11月28 智能分析平台提交内容&#10;      --质量规则维护">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ProvinceDao.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ProvinceDao.class" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java" afterPath="" />
+      <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$/.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/web/PageURLController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/PageURLController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java" />
+      <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/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" />
@@ -23,55 +34,90 @@
  </component>
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="QualityRuleMaintainController.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java">
+      <file leaf-file-name="WorkingOrderManageControll.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="114">
-              <caret line="104" column="18" lean-forward="false" selection-start-line="104" selection-start-column="18" selection-end-line="104" selection-end-column="18" />
-              <folding>
-                <element signature="e#3935#3946#0" expanded="true" />
-                <element signature="e#5186#5192#0" expanded="true" />
-                <element signature="e#5813#5819#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="1205">
+              <caret line="189" column="33" lean-forward="true" selection-start-line="189" selection-start-column="33" selection-end-line="189" selection-end-column="33" />
+              <folding />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="WorkingOrderCreateController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java">
+      <file leaf-file-name="QualityRuleOperationController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleOperationController.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-4972">
-              <caret line="67" column="13" lean-forward="false" selection-start-line="67" selection-start-column="13" selection-end-line="67" selection-end-column="13" />
+            <state relative-caret-position="125">
+              <caret line="82" column="53" lean-forward="false" selection-start-line="82" selection-start-column="53" selection-end-line="82" selection-end-column="53" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="QualityRuleMaintain.jsp" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp">
+      <file leaf-file-name="QualityRuleInfoDao.java" pinned="false" current-in-tab="false">
+        <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="257">
-              <caret line="115" column="100" lean-forward="false" selection-start-line="115" selection-start-column="100" selection-end-line="115" selection-end-column="114" />
+            <state relative-caret-position="242">
+              <caret line="18" column="125" lean-forward="false" selection-start-line="18" selection-start-column="125" selection-end-line="18" selection-end-column="125" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="QualityRuleResultController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java">
+      <file leaf-file-name="QualityRuleInfo.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleInfo.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1880">
-              <caret line="209" column="46" lean-forward="false" selection-start-line="209" selection-start-column="46" selection-end-line="209" selection-end-column="46" />
+            <state relative-caret-position="2772">
+              <caret line="195" column="1" lean-forward="false" selection-start-line="195" selection-start-column="1" selection-end-line="195" selection-end-column="1" />
              <folding />
            </state>
          </provider>
        </entry>
      </file>
-      <file leaf-file-name="ModelMaintainController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java">
+      <file leaf-file-name="DataModelDao.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/DataModelDao.java">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="320">
-              <caret line="144" column="45" lean-forward="false" selection-start-line="144" selection-start-column="45" selection-end-line="144" selection-end-column="45" />
+            <state relative-caret-position="-20">
+              <caret line="37" column="14" lean-forward="true" selection-start-line="37" selection-start-column="14" selection-end-line="37" selection-end-column="14" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </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="374">
+              <caret line="24" column="38" lean-forward="false" selection-start-line="24" selection-start-column="38" selection-end-line="24" selection-end-column="38" />
+              <folding>
+                <element signature="e#556#557#0" expanded="true" />
+                <element signature="e#619#620#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="header.jsp" pinned="false" current-in-tab="false">
+        <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="264">
+              <caret line="276" column="113" lean-forward="false" selection-start-line="276" selection-start-column="113" selection-end-line="276" selection-end-column="113" />
+              <folding>
+                <marker date="1512092899872" expanded="true" signature="28676:28700" ph="..." />
+                <marker date="1512092899872" expanded="true" signature="28918:28932" ph="..." />
+                <marker date="1512092899872" expanded="true" signature="29204:29218" ph="..." />
+                <marker date="1512092899872" expanded="true" signature="29492:29506" ph="..." />
+                <marker date="1512092899872" expanded="true" signature="29669:29686" ph="..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <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">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="295">
+              <caret line="29" column="88" lean-forward="true" selection-start-line="29" selection-start-column="88" selection-end-line="29" selection-end-column="88" />
              <folding />
            </state>
          </provider>
@@ -80,8 +126,18 @@
      <file leaf-file-name="QualityRuleResult.jsp" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp">
          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3794">
-              <caret line="207" column="0" lean-forward="false" selection-start-line="207" selection-start-column="0" selection-end-line="207" selection-end-column="0" />
+            <state relative-caret-position="299">
+              <caret line="29" column="89" lean-forward="false" selection-start-line="29" selection-start-column="89" selection-end-line="29" selection-end-column="89" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="QualityRuleOperation.jsp" pinned="false" current-in-tab="true">
+        <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="281">
+              <caret line="30" column="85" lean-forward="false" selection-start-line="30" selection-start-column="85" selection-end-line="30" selection-end-column="85" />
              <folding />
            </state>
          </provider>
@@ -93,25 +149,14 @@
    <option name="RECENT_TEMPLATES">
      <list>
        <option value="Jsp File" />
-        <option value="Class" />
+        <option value="JavaScript File" />
        <option value="Interface" />
+        <option value="Class" />
      </list>
    </option>
  </component>
  <component name="FindInProjectRecents">
    <findStrings>
-      <find>pentaho/view</find>
-      <find>biserver_config</find>
-      <find>initDate</find>
-      <find>/home/hg</find>
-      <find>新建</find>
-      <find>GJFX_warni</find>
-      <find>XcdChangeOrderDao</find>
-      <find>XcdChangeOrderService</find>
-      <find>createInsideWorkingOrder</find>
-      <find>内部</find>
-      <find>updateRelXcdIdByWarningId</find>
-      <find>warningId</find>
      <find>下发协查单</find>
      <find>returninfo</find>
      <find>getUrlParams</find>
@@ -129,7 +174,19 @@
      <find>paramTbody</find>
      <find>getFullYear()</find>
      <find>dataModelId</find>
+      <find>businessinput</find>
+      <find>province</find>
      <find>ruleMaintainForm</find>
+      <find>filterResultDetailTable</find>
+      <find>labelModelPeriod</find>
+      <find>dataModelViewList</find>
+      <find>receiveRulePageNum</find>
+      <find>#goPageNo</find>
+      <find>initDate</find>
+      <find>#updateRule</find>
+      <find>#relStausTag</find>
+      <find>ruleId</find>
+      <find>updateTag</find>
    </findStrings>
    <replaceStrings>
      <replace>InsideXcdWorkingOrderInfoView</replace>
@@ -152,24 +209,6 @@
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdWorkingOrderInfo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcd.java" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcdTable.jsp" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WarnAnalysisDetail.jsp" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/fop-1.1.jar!/org/apache/fop/afp/AFPEventProducer.class" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/ModelDataType.tag" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningSource.tag" />
-        <option value="$PROJECT_DIR$/src/main/webapp/static/js/commonutils.js" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoT.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoVieDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoDap.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/GjfxRelatedInsideWorkingOrder.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfo.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoView.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.java" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/docx4j-3.1.0.jar!/org/docx4j/openpackaging/packages/OpcPackage.class" />
        <option value="$PROJECT_DIR$/.gitignore" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderCreate.jsp" />
@@ -189,20 +228,38 @@
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DimKpi.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Kpi.java" />
        <option value="$PROJECT_DIR$/src/main/webapp/static/My97DatePicker/WdatePicker.js" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleDao.java" />
        <option value="$PROJECT_DIR$/src/main/webapp/static/js/dygraph-combined2.js" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/AccuracyRule.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/AccuracyRuleDao.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/AccuracyRuleService.java" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRule.java" />
        <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/webapp/static/js/ruleResultDetailTable.js" />
-        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRule.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" />
+        <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/QualityRuleInfo.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleView.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleViewDao.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleViewService.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/static/js/ruleResultDetailTable.js" />
+        <option value="$PROJECT_DIR$/src/main/webapp/static/js/ruleOperationDetailTable.js" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/QualityRule_IfFilter.tag" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleOperationController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleView.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleInfo.java" />
+        <option value="$PROJECT_DIR$/src/main/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/webapp/WEB-INF/layouts/header.jsp" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleOperation.jsp" />
      </list>
    </option>
  </component>
@@ -233,8 +290,8 @@
    </treeState>
  </component>
  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="386" />
-    <option name="y" value="83" />
+    <option name="x" value="-6" />
+    <option name="y" value="251" />
    <option name="width" value="1370" />
    <option name="height" value="744" />
  </component>
@@ -254,6 +311,7 @@
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
+      <pane id="Scratches" />
      <pane id="ProjectPane">
        <subPane>
          <expand>
@@ -272,14 +330,126 @@
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" 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" />
+            </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" />
+            </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="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="static" 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="static" type="462c0819:PsiDirectoryNode" />
+              <item name="js" 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="WEB-INF" type="462c0819:PsiDirectoryNode" />
+              <item name="layouts" 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="tags" 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" />
+            </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>
+              <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="ModelManage" 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="MonitorOperation" type="462c0819:PsiDirectoryNode" />
+            </path>
          </expand>
          <select />
        </subPane>
      </pane>
-      <pane id="Scope" />
      <pane id="AndroidView" />
+      <pane id="Scope" />
      <pane id="PackagesPane" />
-      <pane id="Scratches" />
    </panes>
  </component>
  <component name="PropertiesComponent">
@@ -295,13 +465,13 @@
    <property name="jsx.switch.disabled" value="true" />
  </component>
  <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="D:\代码\智能分析平台\CmszMonitorAnalysis\trunk\数据库脚本\201710" />
-    </key>
    <key name="CopyFile.RECENT_KEYS">
      <recent name="D:\代码\智能分析平台\CmszMonitorAnalysis\trunk\数据库脚本" />
      <recent name="D:\代码\智能分析平台\CmszMonitorAnalysis\trunk\src\main\webapp\static\js" />
    </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\代码\智能分析平台\CmszMonitorAnalysis\trunk\数据库脚本\201710" />
+    </key>
  </component>
  <component name="RunDashboard">
    <option name="ruleStates">
@@ -528,7 +698,11 @@
      <workItem from="1511142387727" duration="53000" />
      <workItem from="1511516699030" duration="1573000" />
      <workItem from="1511519269600" duration="35315000" />
-      <workItem from="1511745927420" duration="54424000" />
+      <workItem from="1511745927420" duration="61751000" />
+      <workItem from="1511860853640" duration="322000" />
+      <workItem from="1511861266553" duration="41183000" />
+      <workItem from="1512006065543" duration="10575000" />
+      <workItem from="1512018064699" duration="21967000" />
    </task>
    <task id="LOCAL-00001" summary="first commit">
      <created>1507828551888</created>
@@ -607,11 +781,18 @@
      <option name="project" value="LOCAL" />
      <updated>1511851529061</updated>
    </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="2017年11月28 智能分析平台提交内容&#10;      --质量规则维护">
+      <created>1511851739774</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1511851739774</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="305185000" />
+    <option name="totallyTimeSpent" value="386559000" />
  </component>
  <component name="TodoView">
    <todo-panel id="selected-file">
@@ -625,32 +806,31 @@
  <component name="ToolWindowManager">
    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
    <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" 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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.58388156" sideWeight="0.5060606" order="8" side_tool="true" content_ui="tabs" />
      <window_info id="Application Servers" 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="15" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
      <window_info id="Capture Tool" 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="2" side_tool="false" content_ui="tabs" />
      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="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.34754097" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32786885" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2967213" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32786885" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" 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.35081968" sideWeight="0.4939394" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.5344262" 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="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.74590164" sideWeight="0.4939394" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5344262" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32786885" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24508321" 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="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25113463" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <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="14" side_tool="false" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
      <window_info id="Favorites" 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="6" side_tool="true" content_ui="tabs" />
      <window_info id="SVN Repositories" 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="7" side_tool="false" content_ui="tabs" />
      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -659,7 +839,44 @@
      <window_info id="IvyIDEA" 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="10" side_tool="false" content_ui="tabs" />
      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
    </layout>
+    <layout-to-restore>
+      <window_info id="SVN Repositories" 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="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" 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="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.58388156" sideWeight="0.5060606" order="8" side_tool="true" content_ui="tabs" />
+      <window_info id="Application Servers" 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="15" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="IvyIDEA" 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="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Tool" 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="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="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.34754097" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32786885" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2967213" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32786885" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.66885245" sideWeight="0.4939394" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5344262" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32786885" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23827533" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" 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="6" side_tool="true" content_ui="tabs" />
+    </layout-to-restore>
  </component>
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="1" />
@@ -727,7 +944,7 @@
          <option name="timeStamp" value="17" />
        </line-breakpoint>
      </breakpoints>
-      <option name="time" value="41" />
+      <option name="time" value="42" />
    </breakpoint-manager>
    <watches-manager />
  </component>
@@ -744,452 +961,442 @@
    </buildFile>
  </component>
  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/PzxAnalysisLifeCycleController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="68" column="13" lean-forward="false" selection-start-line="68" selection-start-column="13" selection-end-line="68" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/PzxDetailController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3965">
-          <caret line="70" column="13" lean-forward="false" selection-start-line="70" selection-start-column="13" selection-end-line="70" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskDetailManageController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-29">
-          <caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        <state relative-caret-position="2086">
+          <caret line="139" column="59" lean-forward="false" selection-start-line="139" selection-start-column="32" selection-end-line="139" selection-end-column="59" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="169">
-          <caret line="66" column="123" lean-forward="false" selection-start-line="66" selection-start-column="123" selection-end-line="66" selection-end-column="123" />
+        <state relative-caret-position="726">
+          <caret line="130" column="11" lean-forward="false" selection-start-line="130" selection-start-column="11" selection-end-line="130" selection-end-column="11" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/IndexController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelMaintain.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="767">
-          <caret line="654" column="0" lean-forward="false" selection-start-line="654" selection-start-column="0" selection-end-line="654" selection-end-column="0" />
-          <folding />
+        <state relative-caret-position="975">
+          <caret line="203" column="4" lean-forward="true" selection-start-line="203" selection-start-column="4" selection-end-line="203" selection-end-column="4" />
+          <folding>
+            <marker date="1511516952446" expanded="true" signature="10247:10253" ph="&amp;nbsp;" />
+            <marker date="1511516952446" expanded="true" signature="10253:10259" ph="&amp;nbsp;" />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java">
+    <entry file="jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/standardSchemas/xhtml1-transitional.dtd">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3919">
-          <caret line="52" column="13" lean-forward="false" selection-start-line="52" selection-start-column="13" selection-end-line="52" selection-end-column="13" />
+        <state relative-caret-position="104">
+          <caret line="643" column="2" lean-forward="false" selection-start-line="643" selection-start-column="2" selection-end-line="643" selection-end-column="2" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleResultController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="80">
-          <caret line="38" column="36" lean-forward="false" selection-start-line="38" selection-start-column="36" selection-end-line="38" selection-end-column="36" />
+        <state relative-caret-position="203">
+          <caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/dygraph-extra.js">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/modelResultDetailTable.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3102">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="2728">
+          <caret line="124" column="73" lean-forward="false" selection-start-line="124" selection-start-column="73" selection-end-line="124" selection-end-column="73" />
          <folding>
-            <element signature="n#!!doc" expanded="false" />
+            <marker date="1511516671157" expanded="true" signature="11810:11822" ph="..." />
+            <marker date="1511516671157" expanded="true" signature="16324:16334" ph="..." />
          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WarnAnalysis.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelResultController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2728">
-          <caret line="211" column="62" lean-forward="true" selection-start-line="211" selection-start-column="62" selection-end-line="211" selection-end-column="62" />
+        <state relative-caret-position="242">
+          <caret line="188" column="0" lean-forward="true" selection-start-line="188" selection-start-column="0" selection-end-line="188" selection-end-column="0" />
          <folding>
-            <marker date="1511516640330" expanded="true" signature="12232:12257" ph="..." />
-            <marker date="1511516640330" expanded="true" signature="40404:40452" ph="..." />
+            <element signature="e#7266#7281#0" expanded="false" />
          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/warnAnalysisDetailTable.js">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/DataSourceDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2178">
-          <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>
-            <marker date="1511516671182" expanded="true" signature="14997:15011" ph="..." />
-            <marker date="1511516671182" expanded="true" signature="16193:16203" ph="..." />
-          </folding>
+        <state relative-caret-position="4">
+          <caret line="15" column="17" lean-forward="false" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WarnAnalysisController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRule.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1112">
-          <caret line="86" column="13" lean-forward="false" selection-start-line="86" selection-start-column="13" selection-end-line="86" selection-end-column="13" />
+        <state relative-caret-position="1">
+          <caret line="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/KpiService.java">
+    <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="-2131">
-          <caret line="28" column="13" lean-forward="false" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        <state relative-caret-position="235">
+          <caret line="37" column="475" lean-forward="true" selection-start-line="37" selection-start-column="475" selection-end-line="37" selection-end-column="493" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/GJFX_datasource_channle_business.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleInfo.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/modelmanage/DataModelService.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-4158">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="169">
+          <caret line="37" column="4" lean-forward="true" selection-start-line="37" selection-start-column="4" selection-end-line="37" selection-end-column="4" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/resources/html5-schema/html5/core-scripting.rnc">
+    <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="157">
-          <caret line="208" column="38" lean-forward="false" selection-start-line="208" selection-start-column="38" selection-end-line="208" selection-end-column="38" />
-          <folding />
+        <state relative-caret-position="428">
+          <caret line="31" column="193" lean-forward="false" selection-start-line="31" selection-start-column="193" selection-end-line="31" selection-end-column="193" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/AccuracyRuleDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/modelmanage/DataModelViewService.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="201">
-          <caret line="36" column="151" lean-forward="false" selection-start-line="36" selection-start-column="151" selection-end-line="36" selection-end-column="151" />
+        <state relative-caret-position="352">
+          <caret line="26" column="32" lean-forward="false" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="32" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/AccuracyRuleService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DimAssociationAnaInfo.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="31" column="94" lean-forward="false" selection-start-line="31" selection-start-column="94" selection-end-line="31" selection-end-column="94" />
+        <state relative-caret-position="74">
+          <caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/AccuracyRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataModelView.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-57">
-          <caret line="69" column="39" lean-forward="false" selection-start-line="69" selection-start-column="39" selection-end-line="69" selection-end-column="39" />
+        <state relative-caret-position="142">
+          <caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoViewDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="48">
-          <caret line="636" column="60" lean-forward="false" selection-start-line="636" selection-start-column="60" selection-end-line="636" selection-end-column="60" />
-          <folding>
-            <marker date="1511516640337" expanded="true" signature="47293:47349" ph="..." />
-            <marker date="1511516640337" expanded="true" signature="47572:47583" ph="..." />
-          </folding>
+        <state relative-caret-position="-114">
+          <caret line="9" column="17" lean-forward="false" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/GjfxDetailInfo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdDetailInfoView.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1682">
-          <caret line="22" column="15" lean-forward="true" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="32" />
+        <state relative-caret-position="66">
+          <caret line="19" column="15" lean-forward="false" selection-start-line="19" selection-start-column="15" selection-end-line="19" selection-end-column="32" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRule.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleView.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="29">
-          <caret line="35" column="33" lean-forward="false" selection-start-line="35" selection-start-column="33" selection-end-line="35" selection-end-column="33" />
+        <state relative-caret-position="0">
+          <caret line="0" column="27" lean-forward="false" selection-start-line="0" selection-start-column="27" selection-end-line="0" selection-end-column="27" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ProvinceDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoView.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="229">
-          <caret line="25" column="51" lean-forward="false" selection-start-line="25" selection-start-column="51" selection-end-line="25" selection-end-column="51" />
+        <state relative-caret-position="-652">
+          <caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleViewDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2530">
-          <caret line="83" column="13" lean-forward="false" selection-start-line="83" selection-start-column="13" selection-end-line="83" selection-end-column="13" />
-          <folding />
+        <state relative-caret-position="112">
+          <caret line="8" column="77" lean-forward="false" selection-start-line="8" selection-start-column="77" selection-end-line="8" selection-end-column="77" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/ChannelService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleViewService.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="215">
-          <caret line="25" column="18" lean-forward="false" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
+        <state relative-caret-position="144">
+          <caret line="18" column="26" lean-forward="false" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FailureForcastController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-268">
-          <caret line="451" column="45" lean-forward="false" selection-start-line="451" selection-start-column="45" selection-end-line="451" selection-end-column="45" />
+        <state relative-caret-position="283">
+          <caret line="113" column="41" lean-forward="false" selection-start-line="113" selection-start-column="41" selection-end-line="113" selection-end-column="41" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ChannelDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/ruleOperationDetailTable.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-49">
-          <caret line="15" column="17" lean-forward="false" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
-          <folding />
+        <state relative-caret-position="1833">
+          <caret line="595" column="1" lean-forward="false" selection-start-line="595" selection-start-column="1" selection-end-line="595" selection-end-column="1" />
+          <folding>
+            <marker date="1512034451482" expanded="true" signature="11708:11720" ph="..." />
+            <marker date="1512034451482" expanded="true" signature="17092:17102" ph="..." />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/ruleResultDetailTable.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
-          <caret line="29" column="31" lean-forward="false" selection-start-line="29" selection-start-column="31" selection-end-line="29" selection-end-column="31" />
-          <folding />
+        <state relative-caret-position="488">
+          <caret line="604" column="1" lean-forward="true" selection-start-line="531" selection-start-column="0" selection-end-line="604" selection-end-column="1" />
+          <folding>
+            <marker date="1512029851527" expanded="true" signature="10054:10066" ph="..." />
+            <marker date="1512029851527" expanded="true" signature="14396:14406" ph="..." />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/ruleResultDetailTable.js">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="559" column="142" lean-forward="true" selection-start-line="559" selection-start-column="142" selection-end-line="559" selection-end-column="142" />
+        <state relative-caret-position="330">
+          <caret line="318" column="112" lean-forward="false" selection-start-line="318" selection-start-column="58" selection-end-line="318" selection-end-column="112" />
          <folding>
-            <marker date="1511836552949" expanded="true" signature="9994:10006" ph="..." />
-            <marker date="1511836552949" expanded="true" signature="14365:14375" ph="..." />
+            <marker date="1511516671189" expanded="true" signature="10442:10454" ph="..." />
+            <marker date="1511516671189" expanded="true" signature="10737:10749" ph="..." />
+            <marker date="1511516671189" expanded="true" signature="15263:15273" ph="..." />
          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderReasultController.java">
+    <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="-6517">
-          <caret line="83" column="13" lean-forward="false" selection-start-line="83" selection-start-column="13" selection-end-line="83" selection-end-column="13" />
+        <state relative-caret-position="-1899">
+          <caret line="199" column="34" lean-forward="true" selection-start-line="199" selection-start-column="34" selection-end-line="199" selection-end-column="34" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderDetail.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/WarningFilter.tag">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2750">
-          <caret line="31" column="16" lean-forward="true" selection-start-line="31" selection-start-column="16" selection-end-line="31" selection-end-column="16" />
-          <folding>
-            <marker date="1511516640336" expanded="true" signature="24226:24239" ph="..." />
-            <marker date="1511516640336" expanded="true" signature="26170:26183" ph="..." />
-            <marker date="1511516640336" expanded="true" signature="30315:30373" ph="..." />
-          </folding>
+        <state relative-caret-position="88">
+          <caret line="4" column="28" lean-forward="true" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderReasult.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-4604">
-          <caret line="254" column="52" lean-forward="false" selection-start-line="254" selection-start-column="52" selection-end-line="254" selection-end-column="52" />
+        <state relative-caret-position="-132">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/PzxAnalysis.jsp">
+    <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="-2772">
-          <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>
-            <marker date="1511516640241" expanded="true" signature="42118:42166" ph="..." />
-          </folding>
+        <state relative-caret-position="383">
+          <caret line="26" column="28" lean-forward="false" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="28" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/ProviderEWarningAnalysis.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="53" column="54" lean-forward="true" selection-start-line="53" selection-start-column="54" selection-end-line="53" selection-end-column="54" />
+        <state relative-caret-position="-5975">
+          <caret line="949" column="22" lean-forward="false" selection-start-line="949" selection-start-column="11" selection-end-line="949" selection-end-column="22" />
          <folding>
-            <marker date="1511516640239" expanded="true" signature="11407:11419" ph="..." />
-            <marker date="1511516640239" expanded="true" signature="16533:16550" ph="..." />
-            <marker date="1511516640239" expanded="true" signature="19595:19612" ph="..." />
-            <marker date="1511516640239" expanded="true" signature="22109:22126" ph="..." />
-            <marker date="1511516640239" expanded="true" signature="25203:25220" ph="..." />
-            <marker date="1511516640239" expanded="true" signature="29676:29724" ph="..." />
+            <marker date="1511516640337" expanded="true" signature="47293:47349" ph="..." />
+            <marker date="1511516640337" expanded="true" signature="47572:47583" ph="..." />
          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/ProviderAnalysisController.java">
+    <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="-6069">
-          <caret line="68" column="13" lean-forward="false" selection-start-line="68" selection-start-column="13" selection-end-line="68" selection-end-column="13" />
+        <state relative-caret-position="565">
+          <caret line="215" column="8" lean-forward="true" selection-start-line="215" selection-start-column="8" selection-end-line="215" selection-end-column="8" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/ProviderEWarningAnalysisController.java">
+    <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="-490">
-          <caret line="63" column="13" lean-forward="false" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
-          <folding />
+        <state relative-caret-position="193">
+          <caret line="27" column="502" lean-forward="false" selection-start-line="27" selection-start-column="468" selection-end-line="27" selection-end-column="502" />
+          <folding>
+            <marker date="1511516636214" expanded="true" signature="3800:4315" ph="SELECT TO_CH... " />
+            <marker date="1511516636214" expanded="true" signature="4473:4979" ph="select to_ch... " />
+            <marker date="1511516636214" expanded="true" signature="5256:5919" ph="SELECT TO_CH... " />
+            <marker date="1511516636214" expanded="true" signature="6216:6835" ph="SELECT TO_CH... " />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/datamanage/KnowledgeCreateController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-4312">
-          <caret line="44" column="13" lean-forward="false" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
+        <state relative-caret-position="-266">
+          <caret line="134" column="7" lean-forward="true" selection-start-line="134" selection-start-column="7" selection-end-line="134" selection-end-column="7" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/dygraph-combined2.js">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/DataModelViewDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="134">
-          <caret line="420" column="40" lean-forward="false" selection-start-line="420" selection-start-column="40" selection-end-line="420" selection-end-column="40" />
-          <folding>
-            <marker date="1511760149533" expanded="true" signature="197398:197440" ph="..." />
-            <marker date="1511760149533" expanded="true" signature="198582:198605" ph="..." />
-            <marker date="1511760149533" expanded="true" signature="198633:198639" ph="&amp;nbsp;" />
-            <marker date="1511760149533" expanded="true" signature="198911:199035" ph="..." />
-            <marker date="1511760149533" expanded="true" signature="199893:200052" ph="..." />
-          </folding>
+        <state relative-caret-position="79">
+          <caret line="28" column="4" lean-forward="true" selection-start-line="28" selection-start-column="4" selection-end-line="28" selection-end-column="4" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/FailureCreateController.java">
+    <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="-8140">
-          <caret line="63" column="13" lean-forward="false" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
+        <state relative-caret-position="-534">
+          <caret line="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Kpi.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/YwglEwarningBusDataView.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="69">
-          <caret line="36" column="34" lean-forward="true" selection-start-line="36" selection-start-column="34" selection-end-line="36" selection-end-column="34" />
+        <state relative-caret-position="154">
+          <caret line="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/modelResultDetailTable.js">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdChangeView.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="122" column="34" lean-forward="true" selection-start-line="122" selection-start-column="34" selection-end-line="122" selection-end-column="34" />
-          <folding>
-            <marker date="1511516671157" expanded="true" signature="11810:11822" ph="..." />
-            <marker date="1511516671157" expanded="true" signature="16324:16334" ph="..." />
-          </folding>
+        <state relative-caret-position="60">
+          <caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/BusinessTag.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/PzxDetailInfoView.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-558">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="38">
+          <caret line="17" column="15" lean-forward="true" selection-start-line="17" selection-start-column="15" selection-end-line="17" selection-end-column="32" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelMaintain.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleView.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3630">
-          <caret line="263" column="18" lean-forward="true" selection-start-line="263" selection-start-column="18" selection-end-line="263" selection-end-column="18" />
+        <state relative-caret-position="-1056">
+          <caret line="27" column="32" lean-forward="true" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" />
          <folding>
-            <marker date="1511516952446" expanded="true" signature="10247:10253" ph="&amp;nbsp;" />
-            <marker date="1511516952446" expanded="true" signature="10253:10259" ph="&amp;nbsp;" />
+            <element signature="imports" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1461">
-          <caret line="102" column="66" lean-forward="false" selection-start-line="102" selection-start-column="66" selection-end-line="102" selection-end-column="66" />
-          <folding />
+        <state relative-caret-position="-1725">
+          <caret line="121" column="28" lean-forward="false" selection-start-line="121" selection-start-column="28" selection-end-line="121" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataModel.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="259">
-          <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 relative-caret-position="1205">
+          <caret line="189" column="33" lean-forward="true" selection-start-line="189" selection-start-column="33" selection-end-line="189" selection-end-column="33" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataModelView.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/QualityRuleInfo.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="73">
-          <caret line="19" column="13" lean-forward="false" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        <state relative-caret-position="2772">
+          <caret line="195" column="1" lean-forward="false" selection-start-line="195" selection-start-column="1" selection-end-line="195" selection-end-column="1" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelResultController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/DataModelDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="69">
-          <caret line="158" column="48" lean-forward="true" selection-start-line="158" selection-start-column="48" selection-end-line="158" selection-end-column="48" />
+        <state relative-caret-position="-20">
+          <caret line="37" column="14" lean-forward="true" selection-start-line="37" selection-start-column="14" selection-end-line="37" selection-end-column="14" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleOperationController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3794">
-          <caret line="207" column="0" lean-forward="false" selection-start-line="207" selection-start-column="0" selection-end-line="207" selection-end-column="0" />
+        <state relative-caret-position="125">
+          <caret line="82" column="53" lean-forward="false" selection-start-line="82" selection-start-column="53" selection-end-line="82" selection-end-column="53" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleInfoDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1880">
-          <caret line="209" column="46" lean-forward="false" selection-start-line="209" selection-start-column="46" selection-end-line="209" selection-end-column="46" />
+        <state relative-caret-position="242">
+          <caret line="18" column="125" lean-forward="false" selection-start-line="18" selection-start-column="125" selection-end-line="18" selection-end-column="125" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="257">
-          <caret line="115" column="100" lean-forward="false" selection-start-line="115" selection-start-column="100" selection-end-line="115" selection-end-column="114" />
-          <folding />
+        <state relative-caret-position="374">
+          <caret line="24" column="38" lean-forward="false" selection-start-line="24" selection-start-column="38" selection-end-line="24" selection-end-column="38" />
+          <folding>
+            <element signature="e#556#557#0" expanded="true" />
+            <element signature="e#619#620#0" expanded="true" />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java">
+    <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="264">
+          <caret line="276" column="113" lean-forward="false" selection-start-line="276" selection-start-column="113" selection-end-line="276" selection-end-column="113" />
+          <folding>
+            <marker date="1512092899872" expanded="true" signature="28676:28700" ph="..." />
+            <marker date="1512092899872" expanded="true" signature="28918:28932" ph="..." />
+            <marker date="1512092899872" expanded="true" signature="29204:29218" ph="..." />
+            <marker date="1512092899872" expanded="true" signature="29492:29506" ph="..." />
+            <marker date="1512092899872" expanded="true" signature="29669:29686" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="320">
-          <caret line="144" column="45" lean-forward="false" selection-start-line="144" selection-start-column="45" selection-end-line="144" selection-end-column="45" />
+        <state relative-caret-position="295">
+          <caret line="29" column="88" lean-forward="true" selection-start-line="29" selection-start-column="88" selection-end-line="29" selection-end-column="88" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-4972">
-          <caret line="67" column="13" lean-forward="false" selection-start-line="67" selection-start-column="13" selection-end-line="67" selection-end-column="13" />
+        <state relative-caret-position="299">
+          <caret line="29" column="89" lean-forward="false" selection-start-line="29" selection-start-column="89" selection-end-line="29" selection-end-column="89" />
          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleOperation.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="104" column="18" lean-forward="false" selection-start-line="104" selection-start-column="18" selection-end-line="104" selection-end-column="18" />
-          <folding>
-            <element signature="e#3935#3946#0" expanded="true" />
-            <element signature="e#5186#5192#0" expanded="true" />
-            <element signature="e#5813#5819#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="281">
+          <caret line="30" column="85" lean-forward="false" selection-start-line="30" selection-start-column="85" selection-end-line="30" selection-end-column="85" />
+          <folding />
        </state>
      </provider>
    </entry>

--- a/src/main/java/com/hp/cmsz/entity/QualityRule.java
+++ b/src/main/java/com/hp/cmsz/entity/QualityRule.java
@@ -28,10 +28,10 @@ public class QualityRule  {
 	private Long provinceId;//省份维表ID
 	private Long dataSourceId;//数据来源ID
 	private String kpiMonitorTime;//指标检测时间
-	private String kpiMonitorRunTime;
-	private String businessTime;//指标业务时间
-	private Date ruleCrtTime;//规则创建时间
-	private Date ruleUpdateTime;//规则更新时间
+	private Timestamp kpiMonitorRunTime;
+	private Timestamp businessTime;//指标业务时间
+	private Timestamp ruleCrtTime;//规则创建时间
+	private Timestamp ruleUpdateTime;//规则更新时间
 	private String ruleValidFlag;//规则是否有效
 	private String ifSystemValue;

@@ -80,28 +80,28 @@ public class QualityRule  {
 	public void setKpiMonitorTime(String kpiMonitorTime) {
 		this.kpiMonitorTime = kpiMonitorTime;
 	}
-	public String getKpiMonitorRunTime() {
+	public Timestamp getKpiMonitorRunTime() {
 		return kpiMonitorRunTime;
 	}
-	public void setKpiMonitorRunTime(String kpiMonitorRunTime) {
+	public void setKpiMonitorRunTime(Timestamp kpiMonitorRunTime) {
 		this.kpiMonitorRunTime = kpiMonitorRunTime;
 	}
-	public String getBusinessTime() {
+	public Timestamp getBusinessTime() {
 		return businessTime;
 	}
-	public void setBusinessTime(String businessTime) {
+	public void setBusinessTime(Timestamp businessTime) {
 		this.businessTime = businessTime;
 	}
-	public Date getRuleCrtTime() {
+	public Timestamp getRuleCrtTime() {
 		return ruleCrtTime;
 	}
-	public void setRuleCrtTime(Date ruleCrtTime) {
+	public void setRuleCrtTime(Timestamp ruleCrtTime) {
 		this.ruleCrtTime = ruleCrtTime;
 	}
-	public Date getRuleUpdateTime() {
+	public Timestamp getRuleUpdateTime() {
 		return ruleUpdateTime;
 	}
-	public void setRuleUpdateTime(Date ruleUpdateTime) {
+	public void setRuleUpdateTime(Timestamp ruleUpdateTime) {
 		this.ruleUpdateTime = ruleUpdateTime;
 	}
 	public String getRuleValidFlag() {
@@ -117,4 +117,22 @@ public class QualityRule  {
 		this.ifSystemValue = ifSystemValue;
 	}

+	@Override
+	public String toString() {
+		return "QualityRule{" +
+				"qualityRuleId=" + qualityRuleId +
+				", businessId=" + businessId +
+				", kpiId=" + kpiId +
+				", channelId=" + channelId +
+				", provinceId=" + provinceId +
+				", dataSourceId=" + dataSourceId +
+				", kpiMonitorTime='" + kpiMonitorTime + '\'' +
+				", kpiMonitorRunTime='" + kpiMonitorRunTime + '\'' +
+				", businessTime=" + businessTime +
+				", ruleCrtTime=" + ruleCrtTime +
+				", ruleUpdateTime=" + ruleUpdateTime +
+				", ruleValidFlag='" + ruleValidFlag + '\'' +
+				", ifSystemValue='" + ifSystemValue + '\'' +
+				'}';
+	}
 }
--- a/src/main/java/com/hp/cmsz/repository/QualityRuleDao.java
+++ b/src/main/java/com/hp/cmsz/repository/QualityRuleDao.java
@@ -21,8 +21,6 @@ import com.hp.cmsz.entity.QualityRule;
 public interface QualityRuleDao extends JpaSpecificationExecutor<QualityRule>,
 		PagingAndSortingRepository<QualityRule, Long>{
 	
-	
-	
 	//根据质量规则ID查找质量规则
 	QualityRule findByQualityRuleId(Long qualityRuleId);
 		
@@ -37,13 +35,12 @@ public interface QualityRuleDao extends JpaSpecificationExecutor<QualityRule>,
 	//根据质量规则ID修改质量规则
 	@Modifying
 	@Query("update from QualityRule qr set qr.businessId=:businessId, qr.kpiId=:kpiId, qr.channelId=:channelId, qr.provinceId=:provinceId, qr.dataSourceId=:dataSourceId, qr.kpiMonitorTime=:kpiMonitorTime, qr.kpiMonitorRunTime=:kpiMonitorRunTime, qr.businessTime=:businessTime, qr.ruleCrtTime=:ruleCrtTime, qr.ruleUpdateTime=:ruleUpdateTime where qr.qualityRuleId=:qualityRuleId")
-	void updateQualityRuleByQualityRuleId(@Param("businessId")Long businessId,@Param("kpiId")Long kpiId,@Param("channelId")Long channelId,@Param("provinceId")Long provinceId,@Param("dataSourceId")Long dataSourceId,@Param("kpiMonitorTime")String kpiMonitorTime,@Param("kpiMonitorRunTime")String kpiMonitorRunTime,@Param("businessTime")String businessTime,@Param("ruleCrtTime")Date ruleCrtTime,@Param("ruleUpdateTime")Date ruleUpdateTime,@Param("qualityRuleId")Long qualityRuleId);
+	void updateQualityRuleByQualityRuleId(@Param("businessId")Long businessId,@Param("kpiId")Long kpiId,@Param("channelId")Long channelId,@Param("provinceId")Long provinceId,@Param("dataSourceId")Long dataSourceId,@Param("kpiMonitorTime")String kpiMonitorTime,@Param("kpiMonitorRunTime")Timestamp kpiMonitorRunTime,@Param("businessTime")Timestamp businessTime,@Param("ruleCrtTime")Timestamp ruleCrtTime,@Param("ruleUpdateTime")Timestamp ruleUpdateTime,@Param("qualityRuleId")Long qualityRuleId);
 	
 	//根据质量规则ID得到数据条数
 	@Query("select count(*) from QualityRule qualityRule where qualityRule.qualityRuleId=:qualityRuleId")
 	Long getNumOfQualityRuleByQualityRuleId(@Param("qualityRuleId")String qualityRuleId);
 	
-	//根据省份、渠道、业务、数据来源筛选查询质量规则
-	List<QualityRule> findByProvinceIdInAndBusinessIdInAndDataSourceIdInAndChannelIdInOrderByQualityRuleIdDesc(Long[] province, Long[] business, Long[] datasource, Long[] channel);
+
 	
 }
--- a/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java
+++ b/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java
 package com.hp.cmsz.service.analysissupport;

-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.List;
-
+import com.hp.cmsz.repository.QualityRuleDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

-import com.hp.cmsz.entity.QualityRule;
-import com.hp.cmsz.repository.QualityRuleDao;
+import java.sql.Timestamp;
+import java.util.List;

 /**
 *
@@ -23,11 +20,6 @@ public class QualityRuleService {
    @Autowired
    private QualityRuleDao qualityRuleDao;

-	//根据筛选条件查询出质量规则
-	public List<QualityRule> getAllQualityRuleByOther(Long[] province,Long[] datasource,Long[] channel,Long[] business){
-		return qualityRuleDao.findByProvinceIdInAndBusinessIdInAndDataSourceIdInAndChannelIdInOrderByQualityRuleIdDesc(province, business, datasource, channel);
-	}
-	
    //根据质量规则ID删除质量规则
    @Transactional(readOnly=false)
    public void deleteByQualityRuleId(List<Long> qualityRuleId){
@@ -36,8 +28,7 @@ public class QualityRuleService {

    //根据质量规则ID修改质量规则
    @Transactional(readOnly=false)
-	public void updateByQualityRuleId(Long businessId, Long kpiId, Long channelId, Long provinceId, Long dataSourceId, String kpiMonitorTime,String kpiMonitorRunTime,String businessTime,Date ruleCrtTime,Date ruleUpdateTime,Long qualityRuleId){
-		qualityRuleDao.updateQualityRuleByQualityRuleId(businessId, kpiId, channelId, provinceId, dataSourceId, kpiMonitorTime, kpiMonitorRunTime, businessTime, ruleCrtTime, ruleUpdateTime, qualityRuleId);
+    public void updateByQualityRuleId(Long businessId,Long kpiId,Long channelId,Long provinceId,Long dataSourceId,String kpiMonitorTime,Timestamp kpiMonitorRunTime,Timestamp businessTime,Timestamp ruleCrtTime,Timestamp ruleUpdateTime,Long qualityRuleId){
+        qualityRuleDao.updateQualityRuleByQualityRuleId(businessId,kpiId,channelId,provinceId,dataSourceId,kpiMonitorTime,kpiMonitorRunTime,businessTime,ruleCrtTime,ruleUpdateTime,qualityRuleId);
    }
-	
 }
--- a/src/main/java/com/hp/cmsz/web/PageURLController.java
+++ b/src/main/java/com/hp/cmsz/web/PageURLController.java
@@ -192,6 +192,7 @@ public class PageURLController {
 	public static String FilterResult = "AnalysisSupport/FilterRuleResult";
 	public static String FilterMaintain = "AnalysisSupport/FilterRuleMaintain";
 	public static String FilterConfiguration = "AnalysisSupport/FilterRuleConfiguration";
+	public static String RuleOperation = "AnalysisSupport/QualityRuleOperation";
 	
 	//基础管理
 	//AuthorityManage映射到WEB-INF/views下的AuthorityManage/AuthorityManage.jsp页面

--- a/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java
+++ b/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java
@@ -13,17 +13,12 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import com.hp.cmsz.service.analysissupport.QualityRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;

 import com.google.gson.Gson;
-import com.hp.cmsz.entity.Business;
 import com.hp.cmsz.entity.Channel;
 import com.hp.cmsz.entity.DataSource;
 import com.hp.cmsz.entity.DataType;
@@ -42,8 +37,6 @@ import com.hp.cmsz.repository.ProvinceDao;
 import com.hp.cmsz.repository.QualityRuleDao;
 import com.hp.cmsz.service.BusinessService;
 import com.hp.cmsz.service.CmszOperationLogService;
-import com.hp.cmsz.service.KpiService;
-import com.hp.cmsz.service.analysissupport.QualityRuleService;
 import com.hp.cmsz.web.PageURLController;

 /**
@@ -243,23 +236,31 @@ public class QualityRuleMaintainController {
 	//新增质量模型
 	@RequestMapping(value = "/saveRuleDataForm", method = RequestMethod.POST)
 	public String saveRuleDataForm(
+	//		@RequestParam(value="channel") String channel,
+//								   @RequestParam(value="dataSource") String dataSourceId,
+//								   @RequestParam(value="kpiMonitorTime") String kpiMonitorTime,
+//								   @RequestParam(value="businessTime") String businessTime,
+//								   @RequestParam(value="ruleCrtTime") String ruleCrtTime,
+//								   @RequestParam(value="ruleUpdateTime") String ruleUpdateTime,
 			HttpServletResponse response,HttpServletRequest request) throws ParseException{
-		System.out.println("123456");
-//		String provinceId = request.getParameter("province");
-//		String businessId = request.getParameter("businessinput");
-//		String channelId =request.getParameter("channel");
+//		String province = request.getParameter("province");
+//		String businessValue = request.getParameter("businessinput");
+		String channel =request.getParameter("channel");
 //		String dataSourceId =request.getParameter("dataSource");
-//		String kpiId = request.getParameter("kpiinput");
-//		String kpiMonitorTime="";
-//		String businessTime="";
-//		String ruleCrtTime="";
-//		String ruleUpdateTime="";
-//
-//		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//		QualityRule qualityRule = new QualityRule();
+//		String kpiValue = request.getParameter("kpiinput");
+//		String kpiMonitorTime=request.getParameter("kpiMonitorTime");
+//		String businessTime=request.getParameter("businessTime");
+//		String ruleCrtTime=request.getParameter("ruleCrtTime");
+//		String ruleUpdateTime=request.getParameter("ruleUpdateTime");
+//		String provinceId = "";
+//		String businessId = "";
+//		String kpiId = "";
+
+		SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		QualityRule qualityRule = new QualityRule();
 //		List<Long> provinceIdList = new ArrayList<Long>();
-//		for(int i=0;i<provinceValue.split(",").length;i++){
-//			provinceIdList.add(Long.parseLong(provinceValue.split(",")[i]));
+//		for(int i=0;i<province.split(",").length;i++){
+//			provinceIdList.add(Long.parseLong(province.split(",")[i]));
 //		}
 //		List<Long> businessIdList = new ArrayList<Long>();
 //		for(int i=0;i<businessValue.split(",").length;i++){
@@ -273,28 +274,39 @@ public class QualityRuleMaintainController {
 //		for(int j=0; j<provinceIdList.size(); j++) {
 //			for(int k=0; k<businessIdList.size(); k++){
 //				for(int l=0; l<kpiIdList.size(); l++){
-//					provinceId = provinceIdList.get(j);
-//					businessId = businessIdList.get(k);
-//					kpiId = kpiIdList.get(l);
-//					if(!provinceId.equals("")){qualityRule.setProvinceId(provinceId);}
-//					if(!businessId.equals("")){qualityRule.setBusinessId(businessId);}
-//					if(!kpiId.equals("")){qualityRule.setKpiId(kpiId);}
-//					if(!channelId.trim().equals("")){qualityRule.setChannelId(Long.parseLong(channelId));}
-//					if(!dataSourceId.trim().equals("")){qualityRule.setDataSourceId(Long.parseLong(dataSourceId));}
-//					if(!kpiMonitorTime.trim().equals("")){qualityRule.setKpiMonitorTime(kpiMonitorTime);}
-//					qualityRule.setKpiMonitorRunTime(kpiMonitorTime+businessTime);
-//					if(!businessTime.trim().equals("")){qualityRule.setBusinessTime(businessTime);}
-//					qualityRule.setRuleCrtTime(sd.parse(ruleCrtTime));
-//					qualityRule.setRuleUpdateTime(sd.parse(ruleUpdateTime));
-//					qualityRule.setRuleValidFlag("0");
-//					qualityRule.setIfSystemValue("0");
-//					qualityRuleDao.save(qualityRule);
+//					provinceId = String.valueOf(provinceIdList.get(j));
+//					businessId = String.valueOf(businessIdList.get(k));
+//					kpiId = String.valueOf(kpiIdList.get(l));
+//					if(!provinceId.trim().equals("")){qualityRule.setProvinceId(Long.parseLong(provinceId));}
+//					if(!businessId.trim().equals("")){qualityRule.setBusinessId(Long.parseLong(businessId));}
+//					if(!kpiId.trim().equals("")){qualityRule.setKpiId(Long.parseLong(kpiId));}
+					qualityRule.setProvinceId(Long.parseLong("1"));
+					qualityRule.setBusinessId(Long.parseLong("1490"));
+					qualityRule.setKpiId(Long.parseLong("2411"));
+					if(!channel.trim().equals("")){
+					qualityRule.setChannelId(Long.parseLong(channel));
+					}
+					//if(!dataSourceId.trim().equals("")){
+					qualityRule.setDataSourceId(Long.parseLong("7"));
+	//}
+					//if(!kpiMonitorTime.trim().equals("")){
+					qualityRule.setKpiMonitorTime("4");
+	//}
+					qualityRule.setKpiMonitorRunTime(Timestamp.valueOf(sd.format(new Date())));
+					//if(!businessTime.trim().equals("")){
+					qualityRule.setBusinessTime(Timestamp.valueOf(sd.format(new Date())));
+	//}
+					qualityRule.setRuleCrtTime(Timestamp.valueOf(sd.format(new Date())));
+					qualityRule.setRuleUpdateTime(Timestamp.valueOf(sd.format(new Date())));
+					qualityRule.setRuleValidFlag("0");
+					qualityRule.setIfSystemValue("0");
+					System.out.println("qualityRule"+qualityRule);
+					qualityRuleDao.save(qualityRule);
 //				}
 //			}
 //		}
-//
-//		cmszOperationLogService.createLog("增加","新建质量模型","quality_rule_warehouse_info_t. QUALITY_RULE_ID="+	qualityRule.getQualityRuleId().toString());
-//		Long qualityRuleId = qualityRule.getQualityRuleId();
+		cmszOperationLogService.createLog("增加","新建质量模型","quality_rule_warehouse_info_t. QUALITY_RULE_ID="+	qualityRule.getQualityRuleId().toString());
+		Long qualityRuleId = qualityRule.getQualityRuleId();
 		return "redirect:AnalysisSupport/QualityRuleResult";
 	}


--- a/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java
+++ b/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java
@@ -9,6 +9,10 @@ import java.util.Map;

 import javax.servlet.http.HttpServletResponse;

+import com.hp.cmsz.entity.*;
+import com.hp.cmsz.repository.*;
+import com.hp.cmsz.service.analysissupport.QualityRuleService;
+import com.hp.cmsz.service.analysissupport.QualityRuleViewService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,22 +21,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;

 import com.google.gson.Gson;
-import com.hp.cmsz.entity.AccuracyRule;
-import com.hp.cmsz.entity.Channel;
-import com.hp.cmsz.entity.DataSource;
-import com.hp.cmsz.entity.Kpi;
-import com.hp.cmsz.entity.Province;
-import com.hp.cmsz.entity.QualityRule;
-import com.hp.cmsz.repository.AccuracyRuleDao;
-import com.hp.cmsz.repository.DataSourceDao;
-import com.hp.cmsz.repository.KpiDao;
-import com.hp.cmsz.repository.ProvinceDao;
-import com.hp.cmsz.repository.QualityRuleDao;
 import com.hp.cmsz.service.BusinessService;
 import com.hp.cmsz.service.ChannelService;
 import com.hp.cmsz.service.CmszOperationLogService;
 import com.hp.cmsz.service.analysissupport.AccuracyRuleService;
-import com.hp.cmsz.service.analysissupport.QualityRuleService;
 import com.hp.cmsz.web.PageURLController;

 /**
@@ -68,6 +60,12 @@ public class QualityRuleResultController {
 	private QualityRuleService qualityRuleService;

 	@Autowired
+	private QualityRuleViewDao qualityRuleViewDao;
+
+	@Autowired
+	private QualityRuleViewService qualityRuleViewService;
+
+	@Autowired
 	private AccuracyRuleService accuracyRuleService;
 	
 	@Autowired
@@ -93,9 +91,9 @@ public class QualityRuleResultController {
 		//查询出所有的业务
 		List<String> businessList=businessService.getAllBusinessIdAndBusinessName();
 		//查询出所有的数据来源信息
-		List<DataSource> datasourceList=(List<DataSource>)dataSourceDao.findDataSource();
-		//查询出所有的质量规则
-		List<QualityRule> qualityRuleViewList=(List<QualityRule>)qualityRuleDao.findAll();
+		List<DataSource> datasourceList=dataSourceDao.findDataSource();
+		//查询出所有质量规则
+		List<QualityRuleView> qualityRuleViewList= (List<QualityRuleView>) qualityRuleViewDao.findAll();

 		Gson gson = new Gson();
 		model.put("provinceList", provinceList);
@@ -114,55 +112,30 @@ public class QualityRuleResultController {
 		@RequestMapping(value = "/ruleTableChange*",method = RequestMethod.GET)
 		@ResponseBody
 		public void modelTableChange(
-				@RequestParam(value = "province", defaultValue="") String province,
-				@RequestParam(value = "channel", defaultValue="") String channel,
-				@RequestParam(value = "datasource", defaultValue="") String datasource,
-				@RequestParam(value = "business", defaultValue="") String business,
+				@RequestParam(value = "dataSource") String dataSource,// 数据来源
+				@RequestParam(value = "chnnal") String chnnal,//渠道
+				@RequestParam(value = "bussines") String bussines,//业务
+				@RequestParam(value = "province") String province,//省份
 				HttpServletResponse response) throws UnsupportedEncodingException{
 			
 			cmszOperationLogService.createLog("查询","质量规则","由筛选项得到质量规则");
-			List<QualityRule> qualityRuleS;
-			//将String型转换成List
-			  String[] channels=channel.split(",");
-			  int size1=channels.length;
-			  Long[] channelS=new Long[size1];
-			  for(int i=0;i<channels.length;i++)
-			  {
-				  channelS[i]=Long.parseLong(channels[i]);
-			  }
-			//将String型转换成List
-			  String[] dataSources=datasource.split(",");
-			  int size2=dataSources.length;
-			  Long[] dataSourceS=new Long[size2];
-			  for(int i=0;i<dataSources.length;i++)
-			  {
-				  dataSourceS[i]=Long.parseLong(dataSources[i]);
-			  }
-			//将String型转换成List
-			  String[] businesss=business.split(",");
-			  int size3=dataSources.length;
-			  Long[] businessS=new Long[size3];
-			  for(int i=0;i<businesss.length;i++)
-			  {
-				  businessS[i]=Long.parseLong(businesss[i]);
-			  }
-			//将String型转换成List
-			  String[] provinces=province.split(",");
-			  int size4=dataSources.length;
-			  Long[] provinceS=new Long[size4];
-			  for(int i=0;i<provinces.length;i++)
-			  {
-				  provinceS[i]=Long.parseLong(provinces[i]);
-			  }
-
-			qualityRuleS=qualityRuleService.getAllQualityRuleByOther(provinceS, dataSourceS, channelS, businessS);
+			List<QualityRuleView> qualityRuleViewList;
+			String[] dataSourceS=dataSource.split(",");
+			String[] chnnalS=chnnal.split(",");
+			String[] bussinesS =bussines.split(",");
+			String[] provinceS=province.split(",");
+			List<Long> dataSourceList=changeStrToList(dataSourceS);
+			List<Long> chnnalList=changeStrToList(chnnalS);
+			List<Long> bussinesList=changeStrToList(bussinesS);
+			List<Long> provinceList=changeStrToList(provinceS);
+			qualityRuleViewList = qualityRuleViewService.getQualityRuleViewBy(dataSourceList,chnnalList,bussinesList,provinceList);

 			Gson gson = new Gson();
 			response.setContentType("text/Xml;charset=gbk");
 			PrintWriter out = null;
 			try {
 				out = response.getWriter();
-				out.println(gson.toJson(qualityRuleS));
+				out.println(gson.toJson(qualityRuleViewList));
 			} catch (IOException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -170,6 +143,16 @@ public class QualityRuleResultController {

 		}

+		//将string数据类型转换成List<Long>类型
+		public List<Long> changeStrToList(String[] str){
+			List<Long> list = new ArrayList<Long>();
+			for(int i=0;i<str.length;i++){
+				list.add(Long.parseLong(str[i]));
+			}
+
+			return list;
+		}
+		
 		//删掉质量规则
 		@RequestMapping(value = "/deleteOneRule*",method = RequestMethod.GET)
 		@ResponseBody

--- a/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class
+++ b/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class
--- a/src/main/webapp/WEB-INF/layouts/header.jsp
+++ b/src/main/webapp/WEB-INF/layouts/header.jsp
@@ -272,9 +272,9 @@
                                    <li class="dropdown-submenu">
                                        <a href="#">数据质量核查</a>
                                        <ul class="dropdown-menu">
-                                            <li><a href="${ctx}/AnalysisSupport/QualityRuleResult">质量规则维护</a></li>
+                                            <li><a href="${ctx}/AnalysisSupport/QualityRuleResult">数据质量规则维护</a></li>
+                                            <li><a href="${ctx}/AnalysisSupport/QualityRuleOperation">数据质量运营</a></li>
                                            <li><a href="${ctx}/AnalysisSupport/FilterRuleResult">过滤规则维护</a></li>
-                                            <li><a href="${ctx}/AnalysisSupport/">质量规则运营</a></li>
                                        </ul>
                                    </li>
                                </shiro:hasPermission>

--- a/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp
+++ b/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp
@@ -25,9 +25,9 @@
 		<div id="content" class="container">
 			<div class="tab-bar-bt">
 				<ul class="nav nav-tabs">
-					<li><a href="${ctx}/AnalysisSupport/QualityRuleResult">质量规则维护</a></li>
+					<li><a href="${ctx}/AnalysisSupport/QualityRuleResult">数据质量规则维护</a></li>
+					<li><a href="${ctx}/AnalysisSupport/QualityRuleOperation">数据质量运营</a></li>
 					<li class="active"><a href="#home" data-toggle="tab">过滤规则维护</a></li>
-					<li><a href="${ctx}/">质量规则运营</a></li>
 				</ul>
 			</div>
 			<div class="section">

--- a/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp
+++ b/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp
@@ -112,9 +112,14 @@
 											<input type='text' class='form-control' id='businessTime' name='businessTime' onfocus='WdatePicker({dateFmt:"yyyy-MM-dd HH:mm:00",readOnly:false,hmsMenuCfg : {H : [ 1, 6 ], m : [ 30, 2 ], s : [ 60, 0 ]}})'/>
 										</td>
 									</tr>
-									<tr><td>规则创建时间（<font color="red">必填</font>）：</td><td><input type="text" class="form-control" id="ruleCrtTime" name="ruleCrtTime" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'ruleCrtTime\')}'})" /></td></tr>
-									<tr><td>规则更新时间（<font color="red">必填</font>）：</td><td><input id="ruleUpdateTime" name="ruleUpdateTime" class="form-control" type="text" onFocus="WdatePicker({maxDate:'#F{$dp.$D(\'ruleUpdateTime\')}'})"> </td></tr>
-									<tr><td>准确性规则：</td>
+									<tr><td>添加准确性规则：</td>
+										<td><table class="table table-hover table-striped" id="displayParam">
+											<thead>
+											<tr><th>规则类型</th><th>范围最大值</th><th>范围最小值</th><th>重复考核粒度</th><th>重复考核开始时间</th><th>重复考核结束时间</th><th>重复是否连续</th><th>重复最大次数</th><th>数据是否累计</th><th><a href="javascript:deleteAllTr()">删除所有规则</a></th></tr>
+											</thead>
+											<tbody id="addTr"></tbody>
+										</table></td></tr>
+										<tr><td>准确性规则类型：</td>
 											<td><select class="form-control" name="ruleType" id="ruleType" >
 			    									<option value="">无</option>
 			    									<option value="1">范围类</option>
@@ -128,6 +133,8 @@
 			    							<tr class="repeate"><td>重复是否连续：</td><td><input type='text' name='ifRepeatedCheckSeries' id='ifRepeatedCheckSeries' class="form-control" style="display: inline;"/></td></tr>
 			    							<tr class="repeate"><td>重复最大次数：</td><td><input type='text' name='repeatedCheckMaxTime' id='repeatedCheckMaxTime' class="form-control" style="display: inline;"/></td></tr>
 			    							<tr class="repeate"><td>数据是否累计：</td><td><input type='text' name='ifRepeatedCheckSummation' id='ifRepeatedCheckSummation' class="form-control" style="display: inline;"/></td></tr>
+											<tr><td></td>
+												<td><button type="button" id="addParam" class="btn btn-primary">添加规则</button></td></tr>
 											<tr><td></td><td><button type="button" id="ruleSubmit" class="btn btn-primary">确定</button>
 															<button type="reset" class="btn btn-warning" id="ruleBack">返回</button>
 											</td></tr>
@@ -146,20 +153,23 @@
 <script type="text/javascript">
 $(".range").hide();
 $(".repeate").hide();
+$("#addParam").hide();
 $("#ruleType").change(function (){
 	var selectValue = $("#ruleType").val();
-	console.log(selectValue);
 	if (selectValue == ""){
 		$(".range").hide();
 		$(".repeate").hide();
+        $("#addParam").hide();
 	}
 	if (selectValue == 1){
 		$(".repeate").hide();
 		$(".range").show();
+        $("#addParam").show();
 	}
 	if (selectValue == 2){
 		$(".range").hide();
 		$(".repeate").show();
+        $("#addParam").show();
 	}
 })
 	

--- a/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp
+++ b/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp
@@ -8,7 +8,7 @@
 <html>
  <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>质量规则维护</title>
+<title>全网监控智能分析平台</title>
 </head>
 <body>
 	<div>
@@ -25,9 +25,9 @@
 		<div id="content" class="container">
 			<div class="tab-bar-bt">
 				<ul class="nav nav-tabs">
-					<li class="active"><a href="#home" data-toggle="tab">质量规则维护</a></li>
+					<li class="active"><a href="#home" data-toggle="tab">数据质量规则维护</a></li>
+					<li><a href="${ctx}/AnalysisSupport/QualityRuleOperation">数据质量运营</a></li>
 					<li><a href="${ctx}/AnalysisSupport/FilterRuleResult">过滤规则维护</a></li>
-					<li><a href="${ctx}/">质量规则运营</a></li>
 				</ul>
 			</div>
 			<div class="section">
@@ -57,7 +57,10 @@
 												<span class="glyphicon glyphicon-list"></span>
 											</button>
 											<div class="slide-menu-tags">
-												
+												<span id="ChannelTag" class="label label-info" data-placement="bottom" ></span>
+												<span id="ProvinceTag" class="label label-info" data-placement="bottom" ></span>
+												<span id="DataSourceTag" class="label label-info" data-placement="bottom" ></span>
+												<span id="BusinessTag" class="label label-info" data-placement="bottom" ></span>
 											</div>
 											
 										</div>
@@ -188,6 +191,7 @@ $("#createRule").click(function(){
 			});
 	}

+	}
 	function ruleResultReset(){
 		ProvinceReset();
 		statsDataSourceReset();//三级联动重置
@@ -208,7 +212,6 @@ $("#createRule").click(function(){


 	});
-	}
 </script>
 </body>
 </html>
\ No newline at end of file
--- a/src/main/webapp/static/js/ruleResultDetailTable.js
+++ b/src/main/webapp/static/js/ruleResultDetailTable.js
@@ -128,19 +128,21 @@ function ruleResultDetailTable(){

 	 header[0] = ["","<input type='radio' name='update'id='update' onclick='javascript:radioChoose(this);'/>","1%",""];
 	 header[1] = ["质量规则ID","qualityRuleId","7%","15"];
-	 header[2] = ["数据来源","dataSourceId","7%","15"];
-	 header[3] = ["渠道","channelId","7%","15"];
-	 header[4] = ["业务","businessId","7%","15"];
-	 header[5] = ["指标名称","kpiId","7%","15"];
-	 header[6] = ["指标编码","kpiCode","7%","15"];
-	 header[7] = ["数据类型","dataSourceId","7%","15"];
-	 header[8] = ["数据采集频率","calCycle","7%","15"];
-	 header[9] = ["指标监控时间","kpiMonitorTime","7%","15"];
-	 header[10] = ["指标采集时间","businessTime","7%","15"];
-	 header[11] = ["准确性规则","accuracyRuleId","7%","15"];
+     header[2] = ["省份","provinceName","7%","15"];
+	 header[3] = ["数据来源","dataSourceName","7%","15"];
+	 header[4] = ["渠道","channelName","7%","15"];
+	 header[5] = ["业务","businessName","7%","15"];
+	 header[6] = ["指标名称","kpiName","7%","15"];
+	 header[7] = ["指标编码","kpiCode","7%","15"];
+	 header[8] = ["数据类型","kpiTypeName","7%","15"];
+	 header[9] = ["数据采集频率","calCycle","7%","15"];
+	 header[10] = ["指标监控范围","kpiMonitorTime","7%","15"];
+	 header[11] = ["指标采集时间","businessTime","7%","15"];
+	 header[12] = ["准确性规则","accuracyRuleId","7%","15"];
 	 
 	 window.pagging = new table_pagging({limit:12,tableId:'ruleResultTable',header:header});
 	 pagging.pagging(jsonData);
+
 }


@@ -299,19 +301,19 @@ table_pagging.prototype = {
 										tdContext = "&nbsp;";
 									}
 									
-									if(k==9){
+									if(k==10){
 										
 										if(tdContext!="&nbsp;"){
 										tdContext = df.format(new Date(tdContext));
 										}
 									}
-	                                if(k==10){
+	                                if(k==11){
 	                                	
 	                                	if(tdContext!="&nbsp;"){
 	                                	tdContext = df.format(new Date(tdContext));
 	                                	}
 									}
-	                                if(k==11){
+	                                if(k==12){
 	                                	tdContext = "<a href='javascript:;' onclick='selectRule(\""+this.getData(this.objectlist[i],"qualityRuleId")+"\")'>查看规则</a>";
 	                                 }

@@ -333,7 +335,7 @@ table_pagging.prototype = {
 						}


-						console.log(tdContext);
+
 						
 						td.innerHTML = tdContext;
 						// alert(tdContext+"----i:"+i+",j:"+j+",k:"+k);
@@ -532,7 +534,7 @@ function selectRule(qualityRuleId){
    $.dialog({
        title:"准确性规则",
        content:"<div id='ruleList'>"+
-        "<div class='col-xs-12'><div class='panel panel-default'><div class='panel-heading'>规则参数列表</div><div class='panel-body'> <table class='table table-hover table-striped'> <thead> <tr> <th width='10%'>规则类型</th> <th width='15%'>范围最大值</th> <th width='15%'>范围最小值</th> <th width='15%'>重复考核粒度</th> <th width='15%'>重复考核开始时间</th> <th width='15%'>重复考核结束时间</th> <th width='15%'>重复是否连续</th> <th width='15%'>重复最大次数</th> <th width='15%'>数据是否累计</th> </tr> </thead> <tbody> </tbody> </table> </div> </div> </div>"+
+        "<div class='col-xs-12'><div class='panel panel-default'><div class='panel-heading'>规则参数列表</div><div class='panel-body'> <table class='table table-hover table-striped'> <thead> <tr> <th width=''>规则类型</th> <th width=''>范围最大值</th> <th width=''>范围最小值</th> <th width=''>重复考核粒度</th> <th width=''>重复考核开始时间</th> <th width=''>重复考核结束时间</th> <th width=''>重复是否连续</th> <th width=''>重复最大次数</th> <th width=''>数据是否累计</th> </tr> </thead> <tbody> </tbody> </table> </div> </div> </div>"+
        "</div>",
        lock:true,
        width:800,
@@ -554,16 +556,46 @@ function selectRule(qualityRuleId){
                    if (data != null && data != "") {
                        var ruleTbody = $('#ruleList tbody');
                        for (var i = 0; i < data.length; i++) {
+                            if(data[i].ifRepeatedCheckSeries == "0"){
+                                data[i].ifRepeatedCheckSeries = "否";
+                            } else if(data[i].ifRepeatedCheckSeries =="1") {
+                                data[i].ifRepeatedCheckSeries ="是";
+                            }
+                            if(data[i].ifRepeatedCheckSummation == "0"){
+                                data[i].ifRepeatedCheckSummation = "否";
+                            } else if(data[i].ifRepeatedCheckSummation =="1"){
+                                data[i].ifRepeatedCheckSummation ="是";
+                            }
+                            if(data[i].repeatedCheckStartTime != null){
+                                data[i].repeatedCheckStartTime = df.format(new Date(data[i].repeatedCheckStartTime));
+							}
+                            if(data[i].repeatedCheckEndTime != null){
+                                data[i].repeatedCheckEndTime = df.format(new Date(data[i].repeatedCheckEndTime));
+							}
+							if(data[i].scopeMaxValue != null){
+                                data[i].scopeMaxValue =parseFloat(data[i].scopeMaxValue);
+							}
+							if(data[i].scopeMinValue != null){
+                                data[i].scopeMinValue =parseFloat(data[i].scopeMinValue);
+							}
+							if(data[i].repeatedCheckGranularity =="day"){
+                                data[i].repeatedCheckGranularity ="日";
+							}else if(data[i].repeatedCheckGranularity =="mon"){
+                                data[i].repeatedCheckGranularity ="月";
+                            }
+
+
                            ruleTbody.append($("<tr></tr>").append("<td>" + data[i].ruleType + "</td>")
-                                .append("<td>" + (data[i].scopeMaxValue == null ? "" : data[i].scopeMaxValue) + "</td>")
-                                .append("<td>" + (data[i].scopeMinValue == null ? "" : data[i].scopeMinValue) + "</td>")
-                                .append("<td>" + (data[i].repeatedCheckGranularity == null ? "" : data[i].repeatedCheckGranularity) + "</td>")
-                                .append("<td>" + (data[i].repeatedCheckStartTime == null ? "" : data[i].repeatedCheckStartTime) + "</td>")
-                                .append("<td>" + (data[i].repeatedCheckEndTime == null ? "" : data[i].repeatedCheckEndTime) + "</td>")
-                                .append("<td>" + (data[i].ifRepeatedCheckSeries == null ? "" : data[i].ifRepeatedCheckSeries) + "</td>")
-                                .append("<td>" + (data[i].repeatedCheckMaxTime == null ? "" : data[i].repeatedCheckMaxTime) + "</td>")
-                                .append("<td>" + (data[i].ifRepeatedCheckSummation == null ? "" : data[i].ifRepeatedCheckSummation) + "</td>"));
+                                .append("<td>" + (data[i].scopeMaxValue == null ? "无" : data[i].scopeMaxValue) + "</td>")
+                                .append("<td>" + (data[i].scopeMinValue == null ? "无" : data[i].scopeMinValue) + "</td>")
+                                .append("<td>" + (data[i].repeatedCheckGranularity == null ? "无" : data[i].repeatedCheckGranularity) + "</td>")
+                                .append("<td>" + (data[i].repeatedCheckStartTime == null ? "无" : data[i].repeatedCheckStartTime) + "</td>")
+                                .append("<td>" + (data[i].repeatedCheckEndTime == null ? "无" : data[i].repeatedCheckEndTime) + "</td>")
+                                .append("<td>" + (data[i].ifRepeatedCheckSeries == null ? "无" : data[i].ifRepeatedCheckSeries) + "</td>")
+                                .append("<td>" + (data[i].repeatedCheckMaxTime == null ? "无" : data[i].repeatedCheckMaxTime) + "</td>")
+                                .append("<td>" + (data[i].ifRepeatedCheckSummation == null ? "无" : data[i].ifRepeatedCheckSummation) + "</td>"));
                        }
+
                    }
                }
            });