2018年5月3日 --智能分析平台

--协查单详情筛选项修改

2018年5月3日 --智能分析平台
dc519c05 · Administrator · 0469aae2 · dc519c05 · dc519c05 · dc519c05
Commit dc519c05 authored May 03, 2018 by Administrator
7 changed files
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,14 +2,18 @@
 <project version="4">
  <component name="ArtifactsWorkspaceSettings">
    <artifacts-to-build>
-      <artifact name="CmszMonitorAnalysis:war exploded" />
+      <artifact name="CmszMonitorAnalysis:war" />
    </artifacts-to-build>
  </component>
  <component name="ChangeListManager">
    <list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change 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 beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdDetailInfoViewDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdDetailInfoViewDao.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/CreateDiagosis.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/CreateDiagosis.jsp" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderReasultController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderReasultController.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningSource.tag" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningSource.tag" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/repository/XcdDetailInfoViewDao.class" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class" afterPath="$PROJECT_DIR$/target/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class" />
    </list>
    <ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
    <ignored path="$PROJECT_DIR$/target/" />
@@ -35,7 +39,149 @@
    <select />
  </component>
  <component name="FileEditorManager">
-    <leaf />
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="XCD_WarningSource.tag" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningSource.tag">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="46">
+              <caret line="9" column="53" lean-forward="false" selection-start-line="9" selection-start-column="53" selection-end-line="9" selection-end-column="53" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="XcdWorkingOrderInfoService.java" pinned="false" current-in-tab="false">
+        <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="220">
+              <caret line="112" column="150" lean-forward="false" selection-start-line="112" selection-start-column="150" selection-end-line="112" selection-end-column="150" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="XcdDetailInfoViewDao.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdDetailInfoViewDao.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="98">
+              <caret line="29" column="53" lean-forward="false" selection-start-line="29" selection-start-column="53" selection-end-line="29" selection-end-column="53" />
+              <folding>
+                <marker date="1525338206832" expanded="true" signature="1158:1413" ph="select XcdDe... XcdDetailInfoView" />
+                <marker date="1525338206832" expanded="true" signature="3691:3861" ph="select xcd.d... XcdDetailInfoView" />
+                <marker date="1525338206832" expanded="true" signature="4275:4484" ph="select WORKI... XCD_WORKING_ORDER_INFO_T" />
+                <marker date="1525338206832" expanded="true" signature="4350:4438" ph="select 1 fro... GJFX_WARNING_INFO_T" />
+                <marker date="1525338206832" expanded="true" signature="4583:4792" ph="select WORKI... XCD_WORKING_ORDER_INFO_T" />
+                <marker date="1525338206832" expanded="true" signature="4658:4746" ph="select 1 fro... GJFX_WARNING_INFO_T" />
+                <marker date="1525338206832" expanded="true" signature="4952:5164" ph="select WORKI... XCD_WORKING_ORDER_INFO_T" />
+                <marker date="1525338206832" expanded="true" signature="5027:5115" ph="select 1 fro... GJFX_WARNING_INFO_T" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="WorkingOrderReasultController.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderReasultController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="868">
+              <caret line="482" column="98" lean-forward="false" selection-start-line="482" selection-start-column="98" selection-end-line="482" selection-end-column="98" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#13298#13314#0" expanded="true" />
+                <element signature="e#18830#18836#0" expanded="true" />
+                <element signature="e#19290#19296#0" expanded="true" />
+                <element signature="e#20076#20082#0" expanded="true" />
+                <element signature="e#20579#20585#0" expanded="true" />
+                <element signature="e#21000#21006#0" expanded="true" />
+                <element signature="e#21431#21437#0" expanded="true" />
+                <element signature="e#22150#22156#0" expanded="true" />
+                <element signature="e#24939#24945#0" expanded="true" />
+                <element signature="e#25144#25150#0" expanded="true" />
+                <element signature="e#25343#25349#0" expanded="true" />
+                <element signature="e#25556#25562#0" expanded="true" />
+                <element signature="e#25765#25771#0" expanded="true" />
+                <element signature="e#25968#25974#0" expanded="true" />
+                <element signature="e#26142#26161#0" expanded="true" />
+                <element signature="e#26681#26687#0" expanded="true" />
+                <element signature="e#29901#29909#0" expanded="true" />
+                <element signature="e#31556#31572#0" expanded="true" />
+                <element signature="e#38736#38742#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Long.class" pinned="false" current-in-tab="false">
+        <entry file="jar://D:/jdk1.6.0_18/jre/lib/rt.jar!/java/lang/Long.class">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="142">
+              <caret line="216" column="23" lean-forward="false" selection-start-line="216" selection-start-column="23" selection-end-line="216" selection-end-column="23" />
+              <folding>
+                <marker date="1410919680000" expanded="false" signature="0:104" ph="/.../" />
+                <marker date="1410919680000" expanded="true" signature="740:1457" ph="{...}" />
+                <marker date="1410919680000" expanded="false" signature="1506:1517" ph=" { " />
+                <marker date="1410919680000" expanded="false" signature="1550:1556" ph=" }" />
+                <marker date="1410919680000" expanded="false" signature="1607:1618" ph=" { " />
+                <marker date="1410919680000" expanded="false" signature="1651:1657" ph=" }" />
+                <marker date="1410919680000" expanded="false" signature="1709:1720" ph=" { " />
+                <marker date="1410919680000" expanded="false" signature="1753:1759" ph=" }" />
+                <marker date="1410919680000" expanded="true" signature="1825:2162" ph="{...}" />
+                <marker date="1410919680000" expanded="true" signature="2209:2536" ph="{...}" />
+                <marker date="1410919680000" expanded="true" signature="2597:3756" ph="{...}" />
+                <marker date="1410919680000" expanded="true" signature="3795:4011" ph="{...}" />
+                <marker date="1410919680000" expanded="true" signature="4098:6497" ph="{...}" />
+                <marker date="1410919680000" expanded="true" signature="6574:6617" ph="{...}" />
+                <marker date="1410919680000" expanded="true" signature="6702:6747" ph="{...}" />
+                <marker date="1410919680000" expanded="true" signature="6822:6865" ph="{...}" />
+                <marker date="1410919680000" expanded="true" signature="6909:7019" ph="{...}" />
+                <marker date="1410919680000" expanded="true" signature="7093:8177" ph="{...}" />
+                <marker date="1410919680000" expanded="false" signature="8205:8216" ph=" { " />
+                <marker date="1410919680000" expanded="false" signature="8234:8240" ph=" }" />
+                <marker date="1410919680000" expanded="true" signature="8300:8349" ph="{...}" />
+                <marker date="1410919680000" expanded="false" signature="8378:8389" ph=" { " />
+                <marker date="1410919680000" expanded="false" signature="8420:8426" ph=" }" />
+                <marker date="1410919680000" expanded="false" signature="8457:8468" ph=" { " />
+                <marker date="1410919680000" expanded="false" signature="8500:8506" ph=" }" />
+                <marker date="1410919680000" expanded="false" signature="8533:8544" ph=" { " />
+                <marker date="1410919680000" expanded="false" signature="8567:8573" ph=" }" />
+                <marker date="1410919680000" expanded="false" signature="8602:8613" ph=" { " />
+                <marker date="1410919680000" expanded="false" signature="8631:8637" ph=" }" />
+                <marker date="1410919680000" expanded="false" signature="8668:8679" ph=" { " />
+                <marker date="1410919680000" expanded="false" signature="8704:8710" ph=" }" />
+                <marker date="1410919680000" expanded="false" signature="8743:8754" ph=" { " />
+                <marker date="1410919680000" expanded="false" signature="8780:8786" ph=" }" />
+                <marker date="1410919680000" expanded="false" signature="8816:8827" ph=" { " />
+                <marker date="1410919680000" expanded="false" signature="8861:8867" ph=" }" />
+                <marker date="1410919680000" expanded="false" signature="8894:8905" ph=" { " />
+                <marker date="1410919680000" expanded="false" signature="8950:8956" ph=" }" />
+                <marker date="1410919680000" expanded="true" signature="8997:9138" ph="{...}" />
+                <marker date="1410919680000" expanded="false" signature="9183:9194" ph=" { " />
+                <marker date="1410919680000" expanded="false" signature="9227:9233" ph=" }" />
+                <marker date="1410919680000" expanded="true" signature="9290:9387" ph="{...}" />
+                <marker date="1410919680000" expanded="true" signature="9444:9872" ph="{...}" />
+                <marker date="1410919680000" expanded="true" signature="9910:10039" ph="{...}" />
+                <marker date="1410919680000" expanded="true" signature="10089:10296" ph="{...}" />
+                <marker date="1410919680000" expanded="false" signature="10344:10355" ph=" { " />
+                <marker date="1410919680000" expanded="false" signature="10375:10381" ph=" }" />
+                <marker date="1410919680000" expanded="true" signature="10437:11179" ph="{...}" />
+                <marker date="1410919680000" expanded="true" signature="11236:12135" ph="{...}" />
+                <marker date="1410919680000" expanded="true" signature="12179:12498" ph="{...}" />
+                <marker date="1410919680000" expanded="false" signature="12554:12565" ph=" { " />
+                <marker date="1410919680000" expanded="false" signature="12602:12608" ph=" }" />
+                <marker date="1410919680000" expanded="false" signature="12665:12676" ph=" { " />
+                <marker date="1410919680000" expanded="false" signature="12713:12719" ph=" }" />
+                <marker date="1410919680000" expanded="true" signature="12763:13233" ph="{...}" />
+                <marker date="1410919680000" expanded="false" signature="13274:13285" ph=" { " />
+                <marker date="1410919680000" expanded="false" signature="13325:13331" ph=" }" />
+                <marker date="1410919680000" expanded="true" signature="13380:13568" ph="{...}" />
+                <marker date="1410919680000" expanded="true" signature="13605:13868" ph="{...}" />
+                <marker date="1410919680000" expanded="true" signature="13687:13698" ph="{}" />
+                <marker date="1410919680000" expanded="true" signature="13715:13862" ph="{...}" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
  </component>
  <component name="FileTemplateManagerImpl">
    <option name="RECENT_TEMPLATES">
@@ -101,11 +247,6 @@
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/GZFX__Dimension_Province_detail_associateDiagosisDetail.tag" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AuthorityManage/AuthorityManage.jsp" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AuthorityManage/RoleManage.jsp" />
-        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/YWTZ_Channel_Bus_KpiTag.tag" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/JPFX_Channel_BusTag.tag" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/PzxTypeRelationTag.tag" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/PzxAttriButeTag.tag" />
@@ -152,6 +293,11 @@
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/CreateDiagosis.jsp" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdDetailInfoView.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningSource.tag" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderReasultController.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/repository/XcdDetailInfoViewDao.java" />
      </list>
    </option>
  </component>
@@ -227,6 +373,7 @@
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
+      <pane id="AndroidView" />
      <pane id="PackagesPane" />
      <pane id="ProjectPane">
        <subPane>
@@ -275,47 +422,31 @@
              <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="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="cmsz" type="462c0819:PsiDirectoryNode" />
-              <item name="vo" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
-              <item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="cmsz" type="462c0819:PsiDirectoryNode" />
-              <item name="ws" 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="webapp" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="cmsz" type="462c0819:PsiDirectoryNode" />
-              <item name="ws" type="462c0819:PsiDirectoryNode" />
-              <item name="impl" 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="webapp" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
-              <item name="cmsz" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
              <item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <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" />
@@ -323,6 +454,8 @@
              <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" />
@@ -331,6 +464,8 @@
              <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" />
@@ -340,14 +475,14 @@
              <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="Scratches" />
-      <pane id="AndroidView" />
      <pane id="Scope" />
+      <pane id="Scratches" />
    </panes>
  </component>
  <component name="PropertiesComponent">
@@ -357,7 +492,7 @@
    <property name="project.structure.proportion" value="0.15" />
    <property name="project.structure.side.proportion" value="0.47011495" />
    <property name="last_opened_file_path" value="D:/w/monitorAnalysis" />
-    <property name="settings.editor.selected.configurable" value="settings.github" />
+    <property name="settings.editor.selected.configurable" value="preferences.sourceCode" />
    <property name="ignore_missing_gitignore" value="true" />
    <property name="SearchEverywhereHistoryKey" value="4A&#9;PSI&#9;JAVA://com.hp.cmsz.web.IndexController#is4ARequest&#10;POST&#9;FILE&#9;jar://E:/Code/monitorAnalysis/src/main/webapp/WEB-INF/lib/batik-svggen-1.7.jar!/org/apache/batik/svggen/font/table/PostTable.class&#10;serialize&#9;PSI&#9;JAVA://org.elasticsearch.common.collect.ImmutableAsList.SerializedForm&#10;afe&#9;PSI&#9;JAVA://org.apache.fop.afp.AFPEventProducer&#10;hea&#9;FILE&#9;file://D:/代码/智能分析平台/CmszMonitorAnalysis/trunk/src/main/webapp/WEB-INF/layouts/header.jsp" />
    <property name="jsx.switch.disabled" value="true" />
@@ -1147,7 +1282,7 @@
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1115860000" />
+    <option name="totallyTimeSpent" value="1135396000" />
  </component>
  <component name="TodoView" selected-index="2">
    <todo-panel id="selected-file">
@@ -1171,31 +1306,57 @@
      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.85081965" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.64144737" 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.3272727" 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.45230263" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
      <window_info id="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.32459018" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3262295" sideWeight="0.48562783" order="13" 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.3256579" sideWeight="0.48562783" order="13" 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.58388156" sideWeight="0.48638427" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6381579" sideWeight="0.48638427" order="5" side_tool="false" content_ui="tabs" />
      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="12" 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="1.0" sideWeight="0.5" order="16" 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.3237519" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3237519" 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.32980332" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
      <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" />
+      <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="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.3256579" sideWeight="0.51437217" 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.32730263" sideWeight="0.5" order="14" 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.3290469" 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="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="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="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.3290469" 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.24962178" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.85081965" 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.3272727" 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.45230263" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="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.32459018" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
      <window_info id="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="REST Client" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5496575" sideWeight="0.5" order="15" 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.3262295" sideWeight="0.48562783" order="13" 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.58388156" sideWeight="0.48638427" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="12" 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="1.0" sideWeight="0.5" order="16" 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.3237519" 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.32980332" 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.056410257" 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>
    <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" />
@@ -1203,32 +1364,32 @@
      <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.6086956" sideWeight="0.5109244" order="8" side_tool="true" 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.3256579" sideWeight="0.51437217" 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.32730263" sideWeight="0.5" order="14" 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.32954547" sideWeight="0.5" order="9" 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.3290469" 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="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="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="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3290469" 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.24963397" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.36024845" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.85081965" 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.3272727" 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.16940789" sideWeight="0.5" order="10" 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.45230263" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
      <window_info id="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.32545453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
+      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32459018" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
      <window_info id="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="REST Client" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.5496575" sideWeight="0.5" order="15" 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.507764" sideWeight="0.48907563" 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.3262295" sideWeight="0.48562783" order="13" 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.14855072" sideWeight="0.49159664" order="13" 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.58388156" sideWeight="0.48638427" order="5" side_tool="false" content_ui="tabs" />
      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="12" 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="16" 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="1.0" sideWeight="0.5" order="16" 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.12066365" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3237519" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" 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.056410257" 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" />
@@ -1348,13 +1509,13 @@
        <line-breakpoint enabled="true" type="java-method">
          <url>jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/commons-fileupload-1.2.2.jar!/org/apache/commons/fileupload/FileItem.class</url>
          <line>33</line>
-          <properties class="org.apache.commons.fileupload.FileItem" method="setFormField">
+          <properties class="org.apache.commons.fileupload.FileItem" method="delete">
            <option name="EMULATED" value="true" />
          </properties>
          <option name="timeStamp" value="58" />
        </line-breakpoint>
      </breakpoints>
-      <option name="time" value="112" />
+      <option name="time" value="118" />
    </breakpoint-manager>
    <watches-manager>
      <configuration name="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory">
@@ -1375,169 +1536,6 @@
    </buildFile>
  </component>
  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/FXJM_Status.tag">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-234">
-          <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>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/FXJM_TitleSearch.tag">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/GJFX_datasource_channle_business.tag">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-418">
-          <caret line="194" column="34" lean-forward="false" selection-start-line="194" selection-start-column="34" selection-end-line="194" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/AppData/Local/Temp/Rar$DIa0.119/Department.java" />
-    <entry file="file://$USER_HOME$/AppData/Local/Temp/AES.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/spring-mvc.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/PzxCiCategoryTagController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3172">
-          <caret line="37" column="13" lean-forward="false" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/PzxCiRelationTagController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="148">
-          <caret line="36" column="13" lean-forward="false" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/IndexController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-4186">
-          <caret line="67" column="22" lean-forward="false" selection-start-line="67" selection-start-column="22" selection-end-line="67" selection-end-column="22" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/commons/utils/Constant.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-102">
-          <caret line="14" column="79" lean-forward="false" selection-start-line="14" selection-start-column="79" selection-end-line="14" selection-end-column="79" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/publicLogController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="148">
-          <caret line="31" column="54" lean-forward="true" selection-start-line="31" selection-start-column="54" selection-end-line="31" selection-end-column="54" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/CmszOperationLogService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="19" column="20" lean-forward="true" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2668">
-          <caret line="74" column="28" lean-forward="false" selection-start-line="74" selection-start-column="28" selection-end-line="74" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/PageURLController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-5690">
-          <caret line="15" column="39" lean-forward="false" selection-start-line="15" selection-start-column="39" selection-end-line="15" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/UserInfoDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="19" column="17" lean-forward="false" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/authoritymanage/AuthorityManageService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1596">
-          <caret line="30" column="18" lean-forward="false" selection-start-line="30" selection-start-column="18" selection-end-line="30" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1518">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/cmsz/ws/DepartmentService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="10" column="24" lean-forward="false" selection-start-line="10" selection-start-column="24" selection-end-line="10" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/cmsz/ws/GroupService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="6" column="17" lean-forward="false" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/cmsz/ws/LoginSwitchService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="17" lean-forward="false" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/cmsz/vo/DepartmentVO.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/cmsz/vo/HttpRespons.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/cmsz/vo/LoginSwitch.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/cmsz/vo/SmsLogVO.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="88">
@@ -1600,7 +1598,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="66">
          <caret line="3" column="13" lean-forward="false" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
-          <folding />
        </state>
      </provider>
    </entry>
@@ -1615,7 +1612,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="198">
          <caret line="26" column="13" lean-forward="false" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
-          <folding />
        </state>
      </provider>
    </entry>
@@ -1675,7 +1671,6 @@
      <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 />
        </state>
      </provider>
    </entry>
@@ -1716,7 +1711,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-990">
          <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>
@@ -1724,7 +1718,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-594">
          <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>
@@ -1732,7 +1725,6 @@
      <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 />
        </state>
      </provider>
    </entry>
@@ -1740,7 +1732,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-1122">
          <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>
@@ -1748,7 +1739,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-924">
          <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>
@@ -1756,7 +1746,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-6738">
          <caret line="40" column="11" lean-forward="false" selection-start-line="40" selection-start-column="11" selection-end-line="40" selection-end-column="11" />
-          <folding />
        </state>
      </provider>
    </entry>
@@ -1764,7 +1753,6 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-710">
          <caret line="39" column="35" lean-forward="false" selection-start-line="39" selection-start-column="35" selection-end-line="39" selection-end-column="35" />
-          <folding />
        </state>
      </provider>
    </entry>
@@ -1772,10 +1760,298 @@
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="88">
          <caret line="7" column="17" lean-forward="false" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderReasult.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="148">
+          <caret line="153" column="57" lean-forward="true" selection-start-line="153" selection-start-column="57" selection-end-line="153" selection-end-column="57" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/commons/utils/SyslogUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-905">
+          <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/commons/filter/XssFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://D:/jdk1.6.0_18/jre/lib/rt.jar!/java/lang/ThreadLocal.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="113">
+          <caret line="27" column="0" lean-forward="false" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://D:/jdk1.6.0_18/jre/lib/rt.jar!/java/lang/Thread.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="78">
+          <caret line="178" column="0" lean-forward="false" selection-start-line="178" selection-start-column="0" selection-end-line="178" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <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="194">
+          <caret line="20" column="21" lean-forward="false" selection-start-line="20" selection-start-column="21" selection-end-line="20" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleReportService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="13" column="13" lean-forward="false" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleReportInfoService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <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/java/com/hp/cmsz/service/analysissupport/QualityRuleInfoService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-622">
+          <caret line="22" column="13" lean-forward="false" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/FilterRuleService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-36">
+          <caret line="16" column="13" lean-forward="false" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/TSWBAnalysisService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-4296">
+          <caret line="27" column="13" lean-forward="false" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleViewDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="8" column="17" lean-forward="false" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleReportInfoDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="12" column="17" lean-forward="false" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleReportDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="11" column="17" lean-forward="false" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <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="2796">
+          <caret line="324" column="9" lean-forward="true" selection-start-line="324" selection-start-column="9" selection-end-line="324" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="false" />
+            <element signature="e#4892#4893#0" expanded="false" />
+            <element signature="e#4949#4950#0" expanded="false" />
+            <element signature="e#5314#5315#0" expanded="false" />
+            <element signature="e#5371#5372#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleInfoDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="88">
+          <caret line="16" column="17" lean-forward="false" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/QualityRuleDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="40" column="69" lean-forward="false" selection-start-line="40" selection-start-column="69" selection-end-line="40" selection-end-column="69" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/DataSourceService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="25" column="53" lean-forward="false" selection-start-line="25" selection-start-column="53" selection-end-line="25" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/AssociateDiagosisDetailController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-6672">
+          <caret line="74" column="39" lean-forward="false" selection-start-line="74" selection-start-column="39" selection-end-line="74" selection-end-column="39" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningSource.tag">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="46">
+          <caret line="9" column="53" lean-forward="false" selection-start-line="9" selection-start-column="53" selection-end-line="9" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://D:/jdk1.6.0_18/jre/lib/rt.jar!/java/lang/Long.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="142">
+          <caret line="216" column="23" lean-forward="false" selection-start-line="216" selection-start-column="23" selection-end-line="216" selection-end-column="23" />
+          <folding>
+            <marker date="1410919680000" expanded="false" signature="0:104" ph="/.../" />
+            <marker date="1410919680000" expanded="true" signature="740:1457" ph="{...}" />
+            <marker date="1410919680000" expanded="false" signature="1506:1517" ph=" { " />
+            <marker date="1410919680000" expanded="false" signature="1550:1556" ph=" }" />
+            <marker date="1410919680000" expanded="false" signature="1607:1618" ph=" { " />
+            <marker date="1410919680000" expanded="false" signature="1651:1657" ph=" }" />
+            <marker date="1410919680000" expanded="false" signature="1709:1720" ph=" { " />
+            <marker date="1410919680000" expanded="false" signature="1753:1759" ph=" }" />
+            <marker date="1410919680000" expanded="true" signature="1825:2162" ph="{...}" />
+            <marker date="1410919680000" expanded="true" signature="2209:2536" ph="{...}" />
+            <marker date="1410919680000" expanded="true" signature="2597:3756" ph="{...}" />
+            <marker date="1410919680000" expanded="true" signature="3795:4011" ph="{...}" />
+            <marker date="1410919680000" expanded="true" signature="4098:6497" ph="{...}" />
+            <marker date="1410919680000" expanded="true" signature="6574:6617" ph="{...}" />
+            <marker date="1410919680000" expanded="true" signature="6702:6747" ph="{...}" />
+            <marker date="1410919680000" expanded="true" signature="6822:6865" ph="{...}" />
+            <marker date="1410919680000" expanded="true" signature="6909:7019" ph="{...}" />
+            <marker date="1410919680000" expanded="true" signature="7093:8177" ph="{...}" />
+            <marker date="1410919680000" expanded="false" signature="8205:8216" ph=" { " />
+            <marker date="1410919680000" expanded="false" signature="8234:8240" ph=" }" />
+            <marker date="1410919680000" expanded="true" signature="8300:8349" ph="{...}" />
+            <marker date="1410919680000" expanded="false" signature="8378:8389" ph=" { " />
+            <marker date="1410919680000" expanded="false" signature="8420:8426" ph=" }" />
+            <marker date="1410919680000" expanded="false" signature="8457:8468" ph=" { " />
+            <marker date="1410919680000" expanded="false" signature="8500:8506" ph=" }" />
+            <marker date="1410919680000" expanded="false" signature="8533:8544" ph=" { " />
+            <marker date="1410919680000" expanded="false" signature="8567:8573" ph=" }" />
+            <marker date="1410919680000" expanded="false" signature="8602:8613" ph=" { " />
+            <marker date="1410919680000" expanded="false" signature="8631:8637" ph=" }" />
+            <marker date="1410919680000" expanded="false" signature="8668:8679" ph=" { " />
+            <marker date="1410919680000" expanded="false" signature="8704:8710" ph=" }" />
+            <marker date="1410919680000" expanded="false" signature="8743:8754" ph=" { " />
+            <marker date="1410919680000" expanded="false" signature="8780:8786" ph=" }" />
+            <marker date="1410919680000" expanded="false" signature="8816:8827" ph=" { " />
+            <marker date="1410919680000" expanded="false" signature="8861:8867" ph=" }" />
+            <marker date="1410919680000" expanded="false" signature="8894:8905" ph=" { " />
+            <marker date="1410919680000" expanded="false" signature="8950:8956" ph=" }" />
+            <marker date="1410919680000" expanded="true" signature="8997:9138" ph="{...}" />
+            <marker date="1410919680000" expanded="false" signature="9183:9194" ph=" { " />
+            <marker date="1410919680000" expanded="false" signature="9227:9233" ph=" }" />
+            <marker date="1410919680000" expanded="true" signature="9290:9387" ph="{...}" />
+            <marker date="1410919680000" expanded="true" signature="9444:9872" ph="{...}" />
+            <marker date="1410919680000" expanded="true" signature="9910:10039" ph="{...}" />
+            <marker date="1410919680000" expanded="true" signature="10089:10296" ph="{...}" />
+            <marker date="1410919680000" expanded="false" signature="10344:10355" ph=" { " />
+            <marker date="1410919680000" expanded="false" signature="10375:10381" ph=" }" />
+            <marker date="1410919680000" expanded="true" signature="10437:11179" ph="{...}" />
+            <marker date="1410919680000" expanded="true" signature="11236:12135" ph="{...}" />
+            <marker date="1410919680000" expanded="true" signature="12179:12498" ph="{...}" />
+            <marker date="1410919680000" expanded="false" signature="12554:12565" ph=" { " />
+            <marker date="1410919680000" expanded="false" signature="12602:12608" ph=" }" />
+            <marker date="1410919680000" expanded="false" signature="12665:12676" ph=" { " />
+            <marker date="1410919680000" expanded="false" signature="12713:12719" ph=" }" />
+            <marker date="1410919680000" expanded="true" signature="12763:13233" ph="{...}" />
+            <marker date="1410919680000" expanded="false" signature="13274:13285" ph=" { " />
+            <marker date="1410919680000" expanded="false" signature="13325:13331" ph=" }" />
+            <marker date="1410919680000" expanded="true" signature="13380:13568" ph="{...}" />
+            <marker date="1410919680000" expanded="true" signature="13605:13868" ph="{...}" />
+            <marker date="1410919680000" expanded="true" signature="13687:13698" ph="{}" />
+            <marker date="1410919680000" expanded="true" signature="13715:13862" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <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="220">
+          <caret line="112" column="150" lean-forward="false" selection-start-line="112" selection-start-column="150" selection-end-line="112" selection-end-column="150" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdDetailInfoViewDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="98">
+          <caret line="29" column="53" lean-forward="false" selection-start-line="29" selection-start-column="53" selection-end-line="29" selection-end-column="53" />
+          <folding>
+            <marker date="1525338206832" expanded="true" signature="1158:1413" ph="select XcdDe... XcdDetailInfoView" />
+            <marker date="1525338206832" expanded="true" signature="3691:3861" ph="select xcd.d... XcdDetailInfoView" />
+            <marker date="1525338206832" expanded="true" signature="4275:4484" ph="select WORKI... XCD_WORKING_ORDER_INFO_T" />
+            <marker date="1525338206832" expanded="true" signature="4350:4438" ph="select 1 fro... GJFX_WARNING_INFO_T" />
+            <marker date="1525338206832" expanded="true" signature="4583:4792" ph="select WORKI... XCD_WORKING_ORDER_INFO_T" />
+            <marker date="1525338206832" expanded="true" signature="4658:4746" ph="select 1 fro... GJFX_WARNING_INFO_T" />
+            <marker date="1525338206832" expanded="true" signature="4952:5164" ph="select WORKI... XCD_WORKING_ORDER_INFO_T" />
+            <marker date="1525338206832" expanded="true" signature="5027:5115" ph="select 1 fro... GJFX_WARNING_INFO_T" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderReasultController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="868">
+          <caret line="482" column="98" lean-forward="false" selection-start-line="482" selection-start-column="98" selection-end-line="482" selection-end-column="98" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#13298#13314#0" expanded="true" />
+            <element signature="e#18830#18836#0" expanded="true" />
+            <element signature="e#19290#19296#0" expanded="true" />
+            <element signature="e#20076#20082#0" expanded="true" />
+            <element signature="e#20579#20585#0" expanded="true" />
+            <element signature="e#21000#21006#0" expanded="true" />
+            <element signature="e#21431#21437#0" expanded="true" />
+            <element signature="e#22150#22156#0" expanded="true" />
+            <element signature="e#24939#24945#0" expanded="true" />
+            <element signature="e#25144#25150#0" expanded="true" />
+            <element signature="e#25343#25349#0" expanded="true" />
+            <element signature="e#25556#25562#0" expanded="true" />
+            <element signature="e#25765#25771#0" expanded="true" />
+            <element signature="e#25968#25974#0" expanded="true" />
+            <element signature="e#26142#26161#0" expanded="true" />
+            <element signature="e#26681#26687#0" expanded="true" />
+            <element signature="e#29901#29909#0" expanded="true" />
+            <element signature="e#31556#31572#0" expanded="true" />
+            <element signature="e#38736#38742#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
  </component>
  <component name="masterDetails">
    <states>

--- a/src/main/java/com/hp/cmsz/repository/XcdDetailInfoViewDao.java
+++ b/src/main/java/com/hp/cmsz/repository/XcdDetailInfoViewDao.java
@@ -24,13 +24,17 @@ public interface  XcdDetailInfoViewDao extends PagingAndSortingRepository<XcdDet
 	 //根绝筛选条件从视图中去查找符合条件的协查单
 	 // List <XcdDetailInfoView> findDistinctWorkingOrderIdByEventHappenTimeBetweenAndChannelIdInAndWarningSourceIdInAndIncidenceInAndProvinceIdInOrderByEventHappenTimeDesc(Date time1,Date time2,Long[] channel, Long[] source,String[] level,Long[] province);
-	  List <XcdDetailInfoView> findWorkingOrderIdDistinctByEventHappenTimeBetweenAndProviderIdInAndDataSourceIdInAndChannelIdInAndWarningSourceIdInAndImportanceLevelIdInAndProvinceIdInOrderByEventHappenTimeDesc(Date time1,Date time2,Long[] provider,Long[] datasource,Long[] channel, Long[] source,Long[] level,Long[] province);
+	 @Query("from XcdDetailInfoView where eventHappenTime between ?1 AND ?2 and providerId in(?3) " +
+			 "and dataSourceId in(?4) and channelId in(?5) and " +
+			 "warningSourceId in(?6) and importanceLevelId in(?7) and provinceId in(?8) order by eventHappenTime desc")
+	List <XcdDetailInfoView> findAllOrderByTimeAndAll
+	 (Date time1,Date time2,List<Long> provider,List<Long> datasource,List<Long> channel, List<Long> source,List<Long> level,List<Long> province);
 	  //根绝筛选条件从视图中去查找符合条件的协查单(增加了告警来源为“其他”的筛选项)
-	  List <XcdDetailInfoView> findWorkingOrderIdDistinctByProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndWorkingOrderIdInOrderByEventHappenTimeDesc(Long[] provider,Long[] datasource,Long[] channel,Long[] province, List<Long> workingorderids);
+	  List <XcdDetailInfoView> findWorkingOrderIdDistinctByProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndWorkingOrderIdInOrderByEventHappenTimeDesc(List<Long> provider,List<Long> datasource,List<Long> channel,List<Long> province, List<Long> workingorderids);
     //告警来源和告警级别同时全选就不再关联告警
-	  List <XcdDetailInfoView> findWorkingOrderIdDistinctByEventHappenTimeBetweenAndProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInOrderByEventHappenTimeDesc(Date time1,Date time2,Long[] provider,Long[] datasource,Long[] channel,Long[] province);
+	  List <XcdDetailInfoView> findWorkingOrderIdDistinctByEventHappenTimeBetweenAndProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInOrderByEventHappenTimeDesc(Date time1,Date time2,List<Long> provider,List<Long> datasource,List<Long> channel,List<Long> province);
 	//end
 	//有协查单ID得到协查单 
@@ -49,7 +53,7 @@ public interface  XcdDetailInfoViewDao extends PagingAndSortingRepository<XcdDet
 	  //List <XcdDetailInfoView> findByEventHappenTimeBetweenAndChannelIdInAndWarningSourceIdInAndIncidenceInAndProvinceIdInAndRelevantFailureIdIsNullOrderByEventHappenTimeDesc(Date startTime, Date endTime, List<Long> channel, List<Long> warningSource, List<String> level, List<Long> province);
 	//根据协查单ID得到数据来源和渠道 add by August
-	@Query("select xcd.dataSourceName, xcd.channelName from XcdDetailInfoView xcd where xcd.dataSourceId is not null and xcd.channelId is not null and xcd.workingOrderId in (:xcdIds)")
+	@Query(value="select xcd.dataSourceName, xcd.channelName from XcdDetailInfoView xcd where xcd.dataSourceId is not null and xcd.channelId is not null and xcd.workingOrderId in (:xcdIds)",nativeQuery=true)
 	List<Object[]> getDataSourceNameAndChannelNameByXcdId(@Param("xcdIds")List<Long> xcdIds);
 	  //根据协查单找最小的发生时间
 	  @Query("select min(xcd.eventHappenTime),max(xcd.actualCompletionTime) from XcdDetailInfoView xcd where xcd.workingOrderId in (:xcdIds)")

--- a/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.java
+++ b/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.java
@@ -5,10 +5,7 @@ import java.math.BigInteger;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 import com.hp.cmsz.entity.InsideXcdWorkingOrderInfo;
 import com.hp.cmsz.repository.*;
@@ -95,21 +92,29 @@ public class XcdWorkingOrderInfoService {
 //		return (List<XcdWorkingOrderInfo>) xcdWorkingOrderInfoDao.findByEventHappenTimeBetweenAndChannelIdInAndWarningSourceIdInAndImportanceLevelIdInAndProvinceIdInAndIfClosedIn(time1,time2,channel,source,level ,province,cloesd);
 //	}
 	//根据筛选条件从视图中查找对应的协查单
-	   public List<XcdDetailInfoView> getAllXcdWorkingOrderInfoBy(Date time1,Date time2,Long[] provider,Long[] datasource,Long[] channel,Long[] source,Long[] level ,Long[] province){
+	   public List<XcdDetailInfoView> getAllXcdWorkingOrderInfoBy(Date time1,Date time2,List<Long> provider,List<Long> datasource,List<Long> channel,List<Long> source,List<Long> level ,List<Long> province){
+	   	System.out.println(time1);
+		   System.out.println(time2);
+		   System.out.println(provider);
+		   System.out.println(datasource);
+		   System.out.println(channel);
+		   System.out.println(source);
+		   System.out.println(level);
+		   System.out.println(province);
 //			return  xcdDetailInfoViewDao.findDistinctWorkingOrderIdByEventHappenTimeBetweenAndChannelIdInAndWarningSourceIdInAndIncidenceInAndProvinceIdInOrderByEventHappenTimeDesc(time1,time2,channel,source ,level,province);
-			return  xcdDetailInfoViewDao.findWorkingOrderIdDistinctByEventHappenTimeBetweenAndProviderIdInAndDataSourceIdInAndChannelIdInAndWarningSourceIdInAndImportanceLevelIdInAndProvinceIdInOrderByEventHappenTimeDesc(time1,time2,provider,datasource,channel,source ,level,province);
+		   return  xcdDetailInfoViewDao.findAllOrderByTimeAndAll(time1,time2,provider,datasource,channel,source ,level,province);
 	   }
 	 //根据筛选条件从视图中查找对应的协查单(增加了告警来源为“其他”的筛选项)
-	   public List<XcdDetailInfoView> getAllXcdWorkingOrderInfoByOther(Long[] provider,Long[] datasource,Long[] channel,Long[] province, List<Long>workingOrderIds){
+	   public List<XcdDetailInfoView> getAllXcdWorkingOrderInfoByOther(List<Long> provider,List<Long> datasource,List<Long> channel,List<Long> province, List<Long>workingOrderIds){
 			return  xcdDetailInfoViewDao.findWorkingOrderIdDistinctByProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInAndWorkingOrderIdInOrderByEventHappenTimeDesc(provider,datasource,channel,province,workingOrderIds);
 	   }
 	 //根据筛选条件从视图中查找对应的协查单，当告警来源和告警级别全选就不再关联告警
-	   public List<XcdDetailInfoView> getAllXcdWorkingOrderInfoNotRelBy(Date time1,Date time2,Long[] provider,Long[] datasource,Long[] channel,Long[] province){
+	   public List<XcdDetailInfoView> getAllXcdWorkingOrderInfoNotRelBy(Date time1,Date time2,List<Long> provider,List<Long> datasource,List<Long> channel,List<Long> province){
 			return  xcdDetailInfoViewDao.findWorkingOrderIdDistinctByEventHappenTimeBetweenAndProviderIdInAndDataSourceIdInAndChannelIdInAndProvinceIdInOrderByEventHappenTimeDesc(time1,time2,provider,datasource,channel,province);

--- a/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderReasultController.java
+++ b/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderReasultController.java
@@ -9,11 +9,7 @@ import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
@@ -378,6 +374,7 @@ public class WorkingOrderReasultController {
 //				@RequestParam(value = "ifClosed2") String ifClosed,
 				@RequestParam(value = "xcdcode") String xcdcode,
 					  HttpServletResponse response) throws ParseException, UnsupportedEncodingException {
+				System.out.println("warningSource"+warningSource);
 				  List<XcdDetailInfoView> xcdWorkingOrderInfoS; //存到List中
 			    //操作日志记录	  
 				 cmszOperationLogService.createLog("查询","协查单明细","协查单明细查询");
@@ -397,52 +394,80 @@ public class WorkingOrderReasultController {
 						  String[] channels=channel.split(",");
 //						  List list1=new ArrayList();
 						  int size1=channels.length;
-						  Long[] channelS=new Long[size1];
+					  List<Long> channelS = new ArrayList<Long>();
-						  for(int i=0;i<channels.length;i++)
+					  for(int i=0;i<channels.length;i++){
-						  {
+						  channelS.add(Long.parseLong(channels[i]));
-//							  list1.add(channels[i]);
+					  }
-							  channelS[i]=Long.parseLong(channels[i]);
+//						  Long[] channelS=new Long[size1];
-						  }
+//						  for(int i=0;i<channels.length;i++)
+//						  {
+////							  list1.add(channels[i]);
+//							  channelS[i]=Long.parseLong(channels[i]);
+//						  }
 						  String[] warningSources=warningSource.split(",");
-//						  List list2=new ArrayList();
 					  int size2=warningSources.length;
-						  Long[] warningSourceS=new Long[size2];
+					  List<Long> warningSourceS = new ArrayList<Long>();
-						  for(int i=0;i<warningSources.length;i++)
+					  for(int i=0;i<warningSources.length;i++){
-						  {
+						  warningSourceS.add(Long.parseLong(warningSources[i]));
-//							  list2.add(warningSources[i]);
+					  }
-							  warningSourceS[i]=Long.parseLong(warningSources[i]);
+//						  System.out.println("string[]"+ Arrays.toString(warningSources));
-						  }
+////						  List list2=new ArrayList();
+//						  int size2=warningSources.length;
+//					  System.out.println("size2"+size2);
+//						  Long[] warningSourceS=new Long[size2];
+//						  for(int i=0;i<warningSources.length;i++)
+//						  {
+////							  list2.add(warningSources[i]);
+//							  warningSourceS[i]=Long.parseLong(warningSources[i]);
+//						  }
+//					  System.out.println("Long[]"+Arrays.toString(warningSourceS));
 						  String[] importantLevels=importantLevel.split(",");
 						  int size3=importantLevels.length;
-						  Long[] importantLevelS=new Long[size3];
+					  List<Long> importantLevelS = new ArrayList<Long>();
-						  for(int i=0;i<importantLevels.length;i++)
+					  for(int i=0;i<importantLevels.length;i++){
-						  {
+						  importantLevelS.add(Long.parseLong(importantLevels[i]));
-//							  list1.add(channels[i]);
-							  importantLevelS[i]=Long.parseLong(importantLevels[i]);
 					  }
+//						  Long[] importantLevelS=new Long[size3];
+//						  for(int i=0;i<importantLevels.length;i++)
+//						  {
+////							  list1.add(channels[i]);
+//							  importantLevelS[i]=Long.parseLong(importantLevels[i]);
+//						  }
 						  String[] provinces=province.split(",");
 						  int size4=provinces.length;
-						  Long[] provinceS=new Long[size4];
+					  List<Long> provinceS = new ArrayList<Long>();
-						  for(int i=0;i<provinces.length;i++)
+					  for(int i=0;i<provinces.length;i++){
-						  {
+						  provinceS.add(Long.parseLong(provinces[i]));
-							  provinceS[i]=Long.parseLong(provinces[i]);  
 					  }
+//						  Long[] provinceS=new Long[size4];
+//						  for(int i=0;i<provinces.length;i++)
+//						  {
+//							  provinceS[i]=Long.parseLong(provinces[i]);
+//						  }
 						  String[] datasourceid=datasource.split(",");
 						  int size5=datasourceid.length;
-						  Long[] datasourceS=new Long[size5];
+					  List<Long> datasourceS = new ArrayList<Long>();
-						  for(int i=0;i<datasourceid.length;i++)
+					  for(int i=0;i<datasourceid.length;i++){
-						  {
+						  datasourceS.add(Long.parseLong(datasourceid[i]));
-							  datasourceS[i]=Long.parseLong(datasourceid[i]);  
+					  }
-						  }
+//						  Long[] datasourceS=new Long[size5];
+//						  for(int i=0;i<datasourceid.length;i++)
+//						  {
+//							  datasourceS[i]=Long.parseLong(datasourceid[i]);
+//						  }
 						  String[] providerid=provider.split(",");
 						  int size6=providerid.length;
-						  Long[] providerS=new Long[size6];
+					  List<Long> providerS = new ArrayList<Long>();
-						  for(int i=0;i<providerid.length;i++)
+					  for(int i=0;i<providerid.length;i++){
-						  {
+						  providerS.add(Long.parseLong(providerid[i]));
-							  providerS[i]=Long.parseLong(providerid[i]);  
+					  }
-						  }
+//						  Long[] providerS=new Long[size6];
+//						  for(int i=0;i<providerid.length;i++)
+//						  {
+//							  providerS[i]=Long.parseLong(providerid[i]);
+//						  }
 						 if(size2>=4){
 							 xcdWorkingOrderInfoS =xcdWorkingOrderInfoService.getAllXcdWorkingOrderInfoNotRelBy(time1,time2,providerS,datasourceS,channelS,provinceS); 

--- a/src/main/webapp/WEB-INF/tags/XCD_WarningSource.tag
+++ b/src/main/webapp/WEB-INF/tags/XCD_WarningSource.tag
@@ -7,7 +7,8 @@
 <div id="ws3" class="slide-menu-option">
     <label>告警来源</label> <!--    <div class="slide-select">   -->
          		                 <select class="slide-menu-select" id="warningSource3" name="warningSource3">  
-          		       		     <option value="2,3" title="全部"selected><a href="#">全部</a></option>
+          		       		     <option value="1,2,3" title="全部"selected><a href="#">全部</a></option>
+									 <option value="1" title="外部告警"><a href="#">外部告警</a></option>
          		                 <option value="2" title="预警"><a href="#">预警</a></option>
          		                 <option value="3" title="隐患"><a href="#">隐患</a></option>
          		                  </select>

--- a/target/classes/com/hp/cmsz/repository/XcdDetailInfoViewDao.class
+++ b/target/classes/com/hp/cmsz/repository/XcdDetailInfoViewDao.class
--- a/target/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class
+++ b/target/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class