Skip to content

C
cmszMonitorAnalysis
Commit 1a4c46a4 authored by afe's avatar afe
Browse files
Options

2017年11月20日

--增加预警与隐患分析内部协查等筛选 --预警与隐患分析状态一栏增加内部协查等 --内部协查单跳转到下发协查单页面 --过滤以下发的内部协查等不让重复下发
parent 55b5bbd8
Show whitespace changes
Inline Side-by-side
Showing with 338 additions and 382 deletions
.idea/workspace.xml
View file @ 1a4c46a4
...@@ -6,23 +6,17 @@ ...@@ -6,23 +6,17 @@
</artifacts-to-build> </artifacts-to-build>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="2017年11月09 智能分析平台提交内容&#10; --"> <list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/GjfxRelatedInsideWorkingOrder.class" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CmszMonitorAnalysis.war" afterPath="$PROJECT_DIR$/CmszMonitorAnalysis.war" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/InsideXcdWorkingOrderInfo.class" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoView.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoDao.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoViewDao.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoViewService.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/monitoroperation/InsideXcdController.class" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/GjfxRelatedInsideWorkingOrder.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoView.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoViewDao.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoViewService.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/数据库脚本/201710/ddl.sql" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/数据库脚本/201710/view.sql" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcd.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcd.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/insideXcdWarningTable.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/insideXcdWarningTable.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" />
</list> </list>
<ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" /> <ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -36,66 +30,7 @@ ...@@ -36,66 +30,7 @@
<option name="refreshEnabled" value="true" /> <option name="refreshEnabled" value="true" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
<file leaf-file-name="WorkingOrderCreateController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-7686">
<caret line="800" column="16" lean-forward="false" selection-start-line="800" selection-start-column="16" selection-end-line="800" selection-end-column="16" />
<folding>
<element signature="method#WorkingOrderCreate#0;class#WorkingOrderCreateController#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="InsideXcdController.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="103" column="25" lean-forward="false" selection-start-line="103" selection-start-column="25" selection-end-line="103" selection-end-column="25" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#3226#3234#0" expanded="true" />
<element signature="e#5420#5451#0" expanded="true" />
<element signature="e#5522#5553#0" expanded="true" />
<element signature="e#6285#6293#0" expanded="true" />
<element signature="e#6499#6507#0" expanded="true" />
<element signature="e#6717#6725#0" expanded="true" />
<element signature="e#6927#6935#0" expanded="true" />
<element signature="e#7141#7149#0" expanded="true" />
<element signature="e#7932#7940#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="InsideXcd.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcd.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1167">
<caret line="335" column="35" lean-forward="false" selection-start-line="335" selection-start-column="35" selection-end-line="335" selection-end-column="35" />
<folding>
<marker date="1510160183250" expanded="true" signature="11635:11691" ph="..." />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WorkingOrderManage.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="1011" column="36" lean-forward="false" selection-start-line="1011" selection-start-column="36" selection-end-line="1011" selection-end-column="36" />
<folding>
<marker date="1510160389963" expanded="true" signature="47336:47392" ph="..." />
<marker date="1510160389963" expanded="true" signature="47615:47626" ph="..." />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
...@@ -108,24 +43,14 @@ ...@@ -108,24 +43,14 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>InsideXcdWorkingOrderInfo</find>
<find>confirmId</find>
<find>xcdprovince</find>
<find>modelIds</find>
<find>xcdWarningInfoViews</find>
<find>type</find>
<find>tempFile</find>
<find>fileName</find>
<find>k==7</find> <find>k==7</find>
<find>create</find> <find>create</find>
<find>xcdWarningInfoViewService</find> <find>xcdWarningInfoViewService</find>
<find>update</find>
<find>glyphicon-class</find> <find>glyphicon-class</find>
<find>style</find> <find>style</find>
<find>exportWord</find> <find>exportWord</find>
<find>createForm</find> <find>createForm</find>
<find>upload</find> <find>upload</find>
<find>createInsideWorkingOrder</find>
<find>window.open</find> <find>window.open</find>
<find>header[7]</find> <find>header[7]</find>
<find>console.log</find> <find>console.log</find>
...@@ -133,11 +58,21 @@ ...@@ -133,11 +58,21 @@
<find>viewAction</find> <find>viewAction</find>
<find>pentaho/view</find> <find>pentaho/view</find>
<find>biserver_config</find> <find>biserver_config</find>
<find>warningId</find>
<find>initDate</find> <find>initDate</find>
<find>/home/hg</find> <find>/home/hg</find>
<find>returninfo</find>
<find>新建</find> <find>新建</find>
<find>GJFX_warni</find>
<find>XcdChangeOrderDao</find>
<find>XcdChangeOrderService</find>
<find>createInsideWorkingOrder</find>
<find>内部</find>
<find>updateRelXcdIdByWarningId</find>
<find>warningId</find>
<find>下发协查单</find>
<find>returninfo</find>
<find>getUrlParams</find>
<find>green-tr</find>
<find>update</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>InsideXcdWorkingOrderInfoView</replace> <replace>InsideXcdWorkingOrderInfoView</replace>
...@@ -163,7 +98,6 @@ ...@@ -163,7 +98,6 @@
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/gson-2.2.4.jar!/com/google/gson/Gson.class" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/gson-2.2.4.jar!/com/google/gson/Gson.class" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java" />
<option value="$PROJECT_DIR$/src/main/resources/application.properties" /> <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/WarningFilter.tag" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/WarningFilter.tag" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/Model_DataType" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/Model_DataType" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp" />
...@@ -188,22 +122,24 @@ ...@@ -188,22 +122,24 @@
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfo.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfo.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoDao.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoView.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoView.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/docx4j-3.1.0.jar!/org/docx4j/openpackaging/packages/OpcPackage.class" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/docx4j-3.1.0.jar!/org/docx4j/openpackaging/packages/OpcPackage.class" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/insideXcdWarningTable.js" />
<option value="$PROJECT_DIR$/.gitignore" /> <option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderCreate.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderCreate.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/modelResultDetailTable.js" /> <option value="$PROJECT_DIR$/src/main/webapp/static/js/modelResultDetailTable.js" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoViewService.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoViewService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoViewDao.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoViewDao.java" />
<option value="$PROJECT_DIR$/build.xml" /> <option value="$PROJECT_DIR$/build.xml" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcd.jsp" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdChangeOrderDao.java" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/insideXcdWarningTable.js" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcd.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -256,7 +192,8 @@ ...@@ -256,7 +192,8 @@
</navigator> </navigator>
<panes> <panes>
<pane id="AndroidView" /> <pane id="AndroidView" />
<pane id="PackagesPane" /> <pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -273,8 +210,7 @@ ...@@ -273,8 +210,7 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scratches" /> <pane id="PackagesPane" />
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -283,7 +219,7 @@ ...@@ -283,7 +219,7 @@
<property name="project.structure.last.edited" value="Artifacts" /> <property name="project.structure.last.edited" value="Artifacts" />
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" /> <property name="project.structure.side.proportion" value="0.2" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../../大屏后台/cm/IntegratedOperationPlatformBackStage" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../大屏前台/http" />
<property name="settings.editor.selected.configurable" value="Settings.JavaScript" /> <property name="settings.editor.selected.configurable" value="Settings.JavaScript" />
<property name="ignore_missing_gitignore" value="true" /> <property name="ignore_missing_gitignore" value="true" />
<property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/代码/智能分析平台/CmszMonitorAnalysis/trunk/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java&#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="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/代码/智能分析平台/CmszMonitorAnalysis/trunk/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java&#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" />
...@@ -519,6 +455,8 @@ ...@@ -519,6 +455,8 @@
<workItem from="1509964275284" duration="13378000" /> <workItem from="1509964275284" duration="13378000" />
<workItem from="1510019466525" duration="30000" /> <workItem from="1510019466525" duration="30000" />
<workItem from="1510044948539" duration="32189000" /> <workItem from="1510044948539" duration="32189000" />
<workItem from="1510981253246" duration="11664000" />
<workItem from="1511142387727" duration="53000" />
</task> </task>
<task id="LOCAL-00001" summary="first commit"> <task id="LOCAL-00001" summary="first commit">
<created>1507828551888</created> <created>1507828551888</created>
...@@ -583,76 +521,56 @@ ...@@ -583,76 +521,56 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1510162734450</updated> <updated>1510162734450</updated>
</task> </task>
<option name="localTasksCounter" value="10" /> <task id="LOCAL-00010" summary="2017年11月09 智能分析平台提交内容&#10; --数据库脚本更新">
<created>1510162965813</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1510162965813</updated>
</task>
<option name="localTasksCounter" value="11" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="200777000" /> <option name="totallyTimeSpent" value="213873000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1616" height="876" extended-state="6" /> <frame x="-8" y="-8" width="1616" height="876" extended-state="6" />
<layout> <layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="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="4" 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.37027028" sideWeight="0.5083548" 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.58388156" sideWeight="0.5060606" order="8" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32969153" 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.33" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
<window_info id="IvyIDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="IvyIDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="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="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="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.33" sideWeight="0.5" order="6" 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="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="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="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.39901477" 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.39901477" 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.32840723" sideWeight="0.5" order="6" 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.32840723" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32297298" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3972973" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3972973" sideWeight="0.49545455" order="12" 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.37027028" sideWeight="0.49164525" 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.7582237" sideWeight="0.4939394" 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.32840723" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20437019" 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.2377892" 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.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" /> <window_info id="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="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="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="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="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.58388156" sideWeight="0.5060606" order="8" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="IvyIDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="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="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="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3223684" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39901477" 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.32840723" 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.32297298" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="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="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.37027028" sideWeight="0.4939394" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<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.3972973" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20179948" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<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>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -707,7 +625,8 @@ ...@@ -707,7 +625,8 @@
<MESSAGE value="2017年11月06提交内容&#10; --实现内部协查单页面查询" /> <MESSAGE value="2017年11月06提交内容&#10; --实现内部协查单页面查询" />
<MESSAGE value="2017年11月08 智能分析平台提交内容&#10; --模型页面" /> <MESSAGE value="2017年11月08 智能分析平台提交内容&#10; --模型页面" />
<MESSAGE value="2017年11月09 智能分析平台提交内容&#10; --模型管理增加字段&#10; --告警监控-内部协查单功能&#10; --验收通过" /> <MESSAGE value="2017年11月09 智能分析平台提交内容&#10; --模型管理增加字段&#10; --告警监控-内部协查单功能&#10; --验收通过" />
<option name="LAST_COMMIT_MESSAGE" value="2017年11月09 智能分析平台提交内容&#10; --模型管理增加字段&#10; --告警监控-内部协查单功能&#10; --验收通过" /> <MESSAGE value="2017年11月09 智能分析平台提交内容&#10; --数据库脚本更新" />
<option name="LAST_COMMIT_MESSAGE" value="2017年11月09 智能分析平台提交内容&#10; --数据库脚本更新" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -736,418 +655,362 @@ ...@@ -736,418 +655,362 @@
</buildFile> </buildFile>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/modelmanage/ModelParameterService.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/FXJM_modelResult_DataModelTypeTag.tag">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238"> <state relative-caret-position="436">
<caret line="23" column="16" lean-forward="false" selection-start-line="23" selection-start-column="16" selection-end-line="23" selection-end-column="16" /> <caret line="90" column="13" lean-forward="false" selection-start-line="90" selection-start-column="13" selection-end-line="90" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataModel.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdWorkingOrderInfoDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="458"> <state relative-caret-position="260">
<caret line="31" column="19" lean-forward="false" selection-start-line="31" selection-start-column="19" selection-end-line="31" selection-end-column="19" /> <caret line="78" column="12" lean-forward="true" selection-start-line="78" selection-start-column="12" selection-end-line="78" selection-end-column="12" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/DataModelDao.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/JCS_datasource_channle.tag">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220"> <state relative-caret-position="0">
<caret line="19" column="38" lean-forward="true" selection-start-line="19" selection-start-column="38" selection-end-line="19" selection-end-column="38" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningSource.tag">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="428"> <state relative-caret-position="132">
<caret line="202" column="63" lean-forward="false" selection-start-line="202" selection-start-column="34" selection-end-line="202" selection-end-column="63" /> <caret line="9" column="51" lean-forward="false" selection-start-line="9" selection-start-column="51" selection-end-line="9" selection-end-column="51" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/commonutils.js"> <entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/spring-data-commons-1.5.1.RELEASE.jar!/org/springframework/data/repository/CrudRepository.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="123"> <state relative-caret-position="194">
<caret line="29" column="12" lean-forward="false" selection-start-line="29" selection-start-column="12" selection-end-line="29" selection-end-column="12" /> <caret line="16" column="26" lean-forward="false" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdWorkingOrderInfo.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_FocusDataDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1316"> <state relative-caret-position="198">
<caret line="78" column="33" lean-forward="false" selection-start-line="78" selection-start-column="16" selection-end-line="78" selection-end-column="33" /> <caret line="13" column="71" lean-forward="true" selection-start-line="13" selection-start-column="54" selection-end-line="13" selection-end-column="71" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdWoRelatedModel.java"> <entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/spring-data-commons-1.5.1.RELEASE.jar!/org/springframework/data/repository/PagingAndSortingRepository.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216"> <state relative-caret-position="198">
<caret line="19" column="33" lean-forward="false" selection-start-line="19" selection-start-column="15" selection-end-line="19" selection-end-column="42" /> <caret line="10" column="44" lean-forward="false" selection-start-line="10" selection-start-column="44" selection-end-line="10" selection-end-column="44" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdWoRelatedModelDao.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoView.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238"> <state relative-caret-position="238">
<caret line="18" column="76" lean-forward="true" selection-start-line="18" selection-start-column="76" selection-end-line="18" selection-end-column="76" /> <caret line="16" column="36" lean-forward="false" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="36" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$PROJECT_DIR$/../../jdk1.6.0_18/jre/lib/rt.jar!/java/io/File.class"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/TSWBAnalysisService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="157"> <state relative-caret-position="198">
<caret line="11" column="41" lean-forward="false" selection-start-line="11" selection-start-column="41" selection-end-line="11" selection-end-column="41" /> <caret line="50" column="41" lean-forward="true" selection-start-line="50" selection-start-column="41" selection-end-line="50" selection-end-column="41" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/ModelResultPeriodTag.tag"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/TSWBAnalysisController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238"> <state relative-caret-position="40">
<caret line="100" column="9" lean-forward="false" selection-start-line="100" selection-start-column="9" selection-end-line="100" selection-end-column="9" /> <caret line="92" column="97" lean-forward="false" selection-start-line="92" selection-start-column="86" selection-end-line="92" selection-end-column="97" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/FXJM_modelResult_DataModelTypeTag.tag"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderDetail.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="436"> <state relative-caret-position="-66">
<caret line="90" column="13" lean-forward="false" selection-start-line="90" selection-start-column="13" selection-end-line="90" selection-end-column="13" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdWorkingOrderInfoDao.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdWarningInfoViewDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260"> <state relative-caret-position="176">
<caret line="78" column="12" lean-forward="true" selection-start-line="78" selection-start-column="12" selection-end-line="78" selection-end-column="12" /> <caret line="41" column="47" lean-forward="false" selection-start-line="41" selection-start-column="30" selection-end-line="41" selection-end-column="47" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxWarningInfoDao.java"> <entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/docx4j-3.1.0.jar!/org/docx4j/openpackaging/packages/OpcPackage.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506"> <state relative-caret-position="194">
<caret line="35" column="34" lean-forward="false" selection-start-line="35" selection-start-column="34" selection-end-line="35" selection-end-column="34" /> <caret line="76" column="16" lean-forward="false" selection-start-line="76" selection-start-column="16" selection-end-line="76" selection-end-column="16" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoDao.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/commons/utils/ExportWordUtil.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330"> <state relative-caret-position="274">
<caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" /> <caret line="190" column="29" lean-forward="false" selection-start-line="190" selection-start-column="29" selection-end-line="190" selection-end-column="29" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.java"> <entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1044"> <state relative-caret-position="396">
<caret line="214" column="46" lean-forward="false" selection-start-line="214" selection-start-column="16" selection-end-line="214" selection-end-column="46" /> <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/GjfxWarningInfoService.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/modelResultDetailTable.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="412"> <state relative-caret-position="351">
<caret line="104" column="33" lean-forward="false" selection-start-line="104" selection-start-column="33" selection-end-line="104" selection-end-column="33" /> <caret line="322" column="60" lean-forward="true" selection-start-line="322" selection-start-column="60" selection-end-line="322" selection-end-column="60" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfo.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/default.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154"> <state relative-caret-position="-182">
<caret line="10" column="45" lean-forward="false" selection-start-line="10" selection-start-column="15" selection-end-line="10" selection-end-column="45" /> <caret line="21" column="8" lean-forward="false" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/JCS_datasource_channle.tag"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoViewDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="478">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="28" column="0" lean-forward="true" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningSource.tag"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/PeriodTag.tag">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132"> <state relative-caret-position="286">
<caret line="9" column="51" lean-forward="false" selection-start-line="9" selection-start-column="51" selection-end-line="9" selection-end-column="51" /> <caret line="100" column="17" lean-forward="false" selection-start-line="100" selection-start-column="9" selection-end-line="100" selection-end-column="17" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/spring-data-commons-1.5.1.RELEASE.jar!/org/springframework/data/repository/CrudRepository.class"> <entry file="file://$PROJECT_DIR$/build.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194"> <state relative-caret-position="264">
<caret line="16" column="26" lean-forward="false" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" /> <caret line="33" column="32" lean-forward="true" selection-start-line="33" selection-start-column="32" selection-end-line="33" selection-end-column="32" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_FocusDataDao.java"> <entry file="jar://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/lib/JavaScriptLanguage.jar!/com/intellij/lang/javascript/index/predefined/EcmaScript.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198"> <state relative-caret-position="146">
<caret line="13" column="71" lean-forward="true" selection-start-line="13" selection-start-column="54" selection-end-line="13" selection-end-column="71" /> <caret line="45" column="18" lean-forward="false" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="18" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/spring-data-commons-1.5.1.RELEASE.jar!/org/springframework/data/repository/PagingAndSortingRepository.class"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoViewService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198"> <state relative-caret-position="158">
<caret line="10" column="44" lean-forward="false" selection-start-line="10" selection-start-column="44" selection-end-line="10" selection-end-column="44" /> <caret line="19" column="47" lean-forward="false" selection-start-line="19" selection-start-column="47" selection-end-line="19" selection-end-column="47" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoView.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238"> <state relative-caret-position="140">
<caret line="16" column="36" lean-forward="false" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="36" /> <caret line="83" column="145" lean-forward="false" selection-start-line="83" selection-start-column="143" selection-end-line="83" selection-end-column="145" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/TSWBAnalysisService.java"> <entry file="file://$PROJECT_DIR$/数据库脚本/201710/view.sql">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198"> <state relative-caret-position="110">
<caret line="50" column="41" lean-forward="true" selection-start-line="50" selection-start-column="41" selection-end-line="50" selection-end-column="41" /> <caret line="5" column="36" lean-forward="true" selection-start-line="5" selection-start-column="36" selection-end-line="5" selection-end-column="36" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/TSWBAnalysisController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderDetailController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="40"> <state relative-caret-position="-1720">
<caret line="92" column="97" lean-forward="false" selection-start-line="92" selection-start-column="86" selection-end-line="92" selection-end-column="97" /> <caret line="64" column="13" lean-forward="false" selection-start-line="64" selection-start-column="13" selection-end-line="64" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderDetail.jsp"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdWarningInfoView.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-66"> <state relative-caret-position="264">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="39" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdWarningInfoView.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238"> <state relative-caret-position="274">
<caret line="23" column="28" lean-forward="false" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="28" /> <caret line="37" column="32" lean-forward="false" selection-start-line="37" selection-start-column="32" selection-end-line="37" selection-end-column="32" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdWarningInfoViewDao.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdChangeOrder.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176"> <state relative-caret-position="194">
<caret line="41" column="47" lean-forward="false" selection-start-line="41" selection-start-column="30" selection-end-line="41" selection-end-column="47" /> <caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WarnAnalysisDetailController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374"> <state relative-caret-position="-2112">
<caret line="42" column="53" lean-forward="false" selection-start-line="42" selection-start-column="36" selection-end-line="42" selection-end-column="53" /> <caret line="79" column="41" lean-forward="false" selection-start-line="79" selection-start-column="13" selection-end-line="79" selection-end-column="41" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/docx4j-3.1.0.jar!/org/docx4j/openpackaging/packages/OpcPackage.class"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdChangeOrderDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194"> <state relative-caret-position="198">
<caret line="76" column="16" lean-forward="false" selection-start-line="76" selection-start-column="16" selection-end-line="76" selection-end-column="16" /> <caret line="18" column="34" lean-forward="false" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="34" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/commons/utils/ExportWordUtil.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfo.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274"> <state relative-caret-position="176">
<caret line="190" column="29" lean-forward="false" selection-start-line="190" selection-start-column="29" selection-end-line="190" selection-end-column="29" /> <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/insideXcdWarningTable.js"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1656"> <state relative-caret-position="88">
<caret line="340" column="16" lean-forward="false" selection-start-line="340" selection-start-column="16" selection-end-line="340" selection-end-column="16" /> <caret line="8" column="90" lean-forward="false" selection-start-line="8" selection-start-column="90" selection-end-line="8" selection-end-column="90" />
<folding>
<marker date="1510147931871" expanded="true" signature="11843:11858" ph="..." />
<marker date="1510147931871" expanded="true" signature="12243:12258" ph="..." />
<marker date="1510147931871" expanded="true" signature="12501:12513" ph="..." />
<marker date="1510147931871" expanded="true" signature="18224:18234" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.gitignore"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdChangeOrderService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396"> <state relative-caret-position="-248">
<caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" /> <caret line="23" column="34" lean-forward="false" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="34" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/modelResultDetailTable.js"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="351"> <state relative-caret-position="186">
<caret line="322" column="60" lean-forward="true" selection-start-line="322" selection-start-column="60" selection-end-line="322" selection-end-column="60" /> <caret line="49" column="33" lean-forward="true" selection-start-line="49" selection-start-column="33" selection-end-line="49" selection-end-column="33" />
<folding>
<marker date="1510154699393" expanded="true" signature="11810:11822" ph="..." />
<marker date="1510154699393" expanded="true" signature="16324:16334" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderCreate.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1231"> <state relative-caret-position="307">
<caret line="344" column="45" lean-forward="true" selection-start-line="344" selection-start-column="45" selection-end-line="344" selection-end-column="45" /> <caret line="323" column="87" lean-forward="false" selection-start-line="323" selection-start-column="69" selection-end-line="323" selection-end-column="87" />
<folding>
<marker date="1510154880544" expanded="true" signature="10332:10344" ph="..." />
<marker date="1510154880544" expanded="true" signature="10627:10639" ph="..." />
<marker date="1510154880544" expanded="true" signature="15153:15163" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/default.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/insideXcdWarningTable.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-182"> <state relative-caret-position="412">
<caret line="21" column="8" lean-forward="false" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" /> <caret line="586" column="11" lean-forward="true" selection-start-line="586" selection-start-column="11" selection-end-line="586" selection-end-column="11" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/GjfxRelatedInsideWorkingOrder.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/GjfxRelatedInsideWorkingOrder.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154"> <state relative-caret-position="116">
<caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" /> <caret line="33" column="16" lean-forward="false" selection-start-line="33" selection-start-column="16" selection-end-line="33" selection-end-column="16" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoViewDao.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="478"> <state relative-caret-position="-532">
<caret line="28" column="0" lean-forward="true" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" /> <caret line="83" column="13" lean-forward="false" selection-start-line="83" selection-start-column="13" selection-end-line="83" selection-end-column="13" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderCreate.jsp"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-400"> <state relative-caret-position="110">
<caret line="44" column="73" lean-forward="true" selection-start-line="44" selection-start-column="73" selection-end-line="44" selection-end-column="73" /> <caret line="9" column="114" lean-forward="false" selection-start-line="9" selection-start-column="85" selection-end-line="9" selection-end-column="114" />
<folding>
<element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/PeriodTag.tag"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286"> <state relative-caret-position="1826">
<caret line="100" column="17" lean-forward="false" selection-start-line="100" selection-start-column="9" selection-end-line="100" selection-end-column="17" /> <caret line="118" column="41" lean-forward="false" selection-start-line="118" selection-start-column="30" selection-end-line="118" selection-end-column="41" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/build.xml"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderReasult.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264"> <state relative-caret-position="0">
<caret line="33" column="32" lean-forward="true" selection-start-line="33" selection-start-column="32" selection-end-line="33" selection-end-column="32" /> <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> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningStatus.tag">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5553"> <state relative-caret-position="0">
<caret line="115" column="56" lean-forward="false" selection-start-line="115" selection-start-column="47" selection-end-line="115" selection-end-column="56" /> <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>
<element signature="method#list#0;class#WorkingOrderManageControll#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285"> <state relative-caret-position="186">
<caret line="1011" column="36" lean-forward="false" selection-start-line="1011" selection-start-column="36" selection-end-line="1011" selection-end-column="36" /> <caret line="334" column="62" lean-forward="true" selection-start-line="334" selection-start-column="62" selection-end-line="334" selection-end-column="62" />
<folding>
<marker date="1510160389963" expanded="true" signature="47336:47392" ph="..." />
<marker date="1510160389963" expanded="true" signature="47615:47626" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/lib/JavaScriptLanguage.jar!/com/intellij/lang/javascript/index/predefined/EcmaScript.js"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/GjfxWarningInfo.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="146"> <state relative-caret-position="172">
<caret line="45" column="18" lean-forward="false" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="18" /> <caret line="22" column="34" lean-forward="false" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="34" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxWarningInfoDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-7686"> <state relative-caret-position="164">
<caret line="800" column="16" lean-forward="false" selection-start-line="800" selection-start-column="16" selection-end-line="800" selection-end-column="16" /> <caret line="31" column="60" lean-forward="false" selection-start-line="31" selection-start-column="47" selection-end-line="31" selection-end-column="60" />
<folding>
<element signature="method#WorkingOrderCreate#0;class#WorkingOrderCreateController#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoViewService.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="158"> <state relative-caret-position="352">
<caret line="19" column="47" lean-forward="false" selection-start-line="19" selection-start-column="47" selection-end-line="19" selection-end-column="47" /> <caret line="22" column="20" lean-forward="true" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154"> <state relative-caret-position="93">
<caret line="11" column="44" lean-forward="false" selection-start-line="11" selection-start-column="44" selection-end-line="11" selection-end-column="44" /> <caret line="25" column="4" lean-forward="true" selection-start-line="25" selection-start-column="4" selection-end-line="25" selection-end-column="4" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcd.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140"> <state relative-caret-position="8">
<caret line="83" column="145" lean-forward="false" selection-start-line="83" selection-start-column="143" selection-end-line="83" selection-end-column="145" /> <caret line="286" column="48" lean-forward="false" selection-start-line="286" selection-start-column="48" selection-end-line="286" selection-end-column="48" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcd.jsp"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1167"> <state relative-caret-position="220">
<caret line="335" column="35" lean-forward="false" selection-start-line="335" selection-start-column="35" selection-end-line="335" selection-end-column="35" /> <caret line="685" column="51" lean-forward="false" selection-start-line="685" selection-start-column="51" selection-end-line="685" selection-end-column="51" />
<folding>
<marker date="1510160183250" expanded="true" signature="11635:11691" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/数据库脚本/201710/view.sql"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/GjfxWarningInfoService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110"> <state relative-caret-position="208">
<caret line="5" column="36" lean-forward="true" selection-start-line="5" selection-start-column="36" selection-end-line="5" selection-end-column="36" /> <caret line="28" column="39" lean-forward="false" selection-start-line="28" selection-start-column="39" selection-end-line="28" selection-end-column="39" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/static/css/styles.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315"> <state relative-caret-position="22">
<caret line="103" column="25" lean-forward="false" selection-start-line="103" selection-start-column="25" selection-end-line="103" selection-end-column="25" /> <caret line="854" column="16" lean-forward="false" selection-start-line="854" selection-start-column="7" selection-end-line="854" selection-end-column="16" />
<folding> <folding />
<element signature="imports" expanded="true" />
<element signature="e#3226#3234#0" expanded="true" />
<element signature="e#5420#5451#0" expanded="true" />
<element signature="e#5522#5553#0" expanded="true" />
<element signature="e#6285#6293#0" expanded="true" />
<element signature="e#6499#6507#0" expanded="true" />
<element signature="e#6717#6725#0" expanded="true" />
<element signature="e#6927#6935#0" expanded="true" />
<element signature="e#7141#7149#0" expanded="true" />
<element signature="e#7932#7940#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
CmszMonitorAnalysis.war
View file @ 1a4c46a4
No preview for this file type
src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java
View file @ 1a4c46a4
...@@ -10,5 +10,6 @@ import java.util.List; ...@@ -10,5 +10,6 @@ import java.util.List;
public interface GjfxRelatedInsideWorkingOrderDao extends PagingAndSortingRepository<GjfxRelatedInsideWorkingOrder, Long>, public interface GjfxRelatedInsideWorkingOrderDao extends PagingAndSortingRepository<GjfxRelatedInsideWorkingOrder, Long>,
JpaSpecificationExecutor<GjfxRelatedInsideWorkingOrder> { JpaSpecificationExecutor<GjfxRelatedInsideWorkingOrder> {
List<GjfxRelatedInsideWorkingOrder> findAllByInnerWorkingOrderId(Long id); List<GjfxRelatedInsideWorkingOrder> findAllByInnerWorkingOrderId(Long id);
List<GjfxRelatedInsideWorkingOrder> findAllByWarningIdIn(List id);
} }
src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java
View file @ 1a4c46a4
...@@ -5,12 +5,7 @@ import java.math.BigInteger; ...@@ -5,12 +5,7 @@ import java.math.BigInteger;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.*;
import java.util.Calendar;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
...@@ -46,6 +41,7 @@ import org.dom4j.Document; ...@@ -46,6 +41,7 @@ import org.dom4j.Document;
import org.dom4j.DocumentException; import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper; import org.dom4j.DocumentHelper;
import org.dom4j.Element; import org.dom4j.Element;
import org.elasticsearch.index.mapper.SourceToParse;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -133,6 +129,7 @@ public class WorkingOrderCreateController { ...@@ -133,6 +129,7 @@ public class WorkingOrderCreateController {
String[] warningid = warningIds.split(","); String[] warningid = warningIds.split(",");
List<String> wid = changeStrToList(warningid); List<String> wid = changeStrToList(warningid);
System.out.println();
List<XcdWarningInfoView> xcdwarningdeattilinfo = xcdWarningInfoViewDao.findByWarningIdIn(wid); List<XcdWarningInfoView> xcdwarningdeattilinfo = xcdWarningInfoViewDao.findByWarningIdIn(wid);
String riskEarlyType = xcdwarningdeattilinfo.get(0).getRiskEarlyWarningTypeName();//根据告警id去查找对应的隐患id再查找出对应的隐患name String riskEarlyType = xcdwarningdeattilinfo.get(0).getRiskEarlyWarningTypeName();//根据告警id去查找对应的隐患id再查找出对应的隐患name
String channel = xcdwarningdeattilinfo.get(0).getChannelName(); String channel = xcdwarningdeattilinfo.get(0).getChannelName();
...@@ -625,24 +622,14 @@ public class WorkingOrderCreateController { ...@@ -625,24 +622,14 @@ public class WorkingOrderCreateController {
xcdWorkingOrderInfo.setIfGeneratedBySystem('Y');//生成协查单时，将该字段置为Y，即是由系统触发生成 xcdWorkingOrderInfo.setIfGeneratedBySystem('Y');//生成协查单时，将该字段置为Y，即是由系统触发生成
xcdWorkingOrderInfo.setWorkingOrderCode(strList.get(11)); xcdWorkingOrderInfo.setWorkingOrderCode(strList.get(11));
gjfxWarningInfoService.updateRelXcdIdByWarningId('2', workingId, warningids); gjfxWarningInfoService.updateRelXcdIdByWarningId('2', workingId, warningids);
for (int j = 0; j < modelIds.size(); j++) { for (int j = 0; j < modelIds.size(); j++) {
XcdWoRelatedModel xcdWoRelatedModel = new XcdWoRelatedModel(); XcdWoRelatedModel xcdWoRelatedModel = new XcdWoRelatedModel();
xcdWoRelatedModel.setWorkingOrderId(workingId); xcdWoRelatedModel.setWorkingOrderId(workingId);
xcdWoRelatedModel.setDataModelId(Long.parseLong(modelIds.get(j))); xcdWoRelatedModel.setDataModelId(Long.parseLong(modelIds.get(j)));
xcdWoRelatedModelDao.save(xcdWoRelatedModel); xcdWoRelatedModelDao.save(xcdWoRelatedModel);
} }
//操作日志记录 start
/*CmszOperationLog cmszOperationLog=new CmszOperationLog();
UserInfo userinfo=(UserInfo) SecurityUtils.getSubject().getSession().getAttribute("CURRENT_USER_SESSION");
System.out.println(userinfo.getUserId());
cmszOperationLog.setUserId(userinfo.getUserId());
cmszOperationLog.setUserOperation("增加");
Date date=new Date();
System.out.println(date);
cmszOperationLog.setOperationDate(date);
cmszOperationLog.setOperationPage("WorkingOrderCreate.jsp");
cmszOperationLog.setOperationDesc("WORKING_ORDER_ID="+workingId);
cmszOperationLogDao.save(cmszOperationLog);*/
cmszOperationLogService.createLog("增加", "触发sm7生成协查单", "xcd_working_order_info_t.WORKING_ORDER_ID=" cmszOperationLogService.createLog("增加", "触发sm7生成协查单", "xcd_working_order_info_t.WORKING_ORDER_ID="
+ workingId); + workingId);
//操作日志记录 end //操作日志记录 end
...@@ -679,10 +666,28 @@ public class WorkingOrderCreateController { ...@@ -679,10 +666,28 @@ public class WorkingOrderCreateController {
throws ParseException, UnsupportedEncodingException { throws ParseException, UnsupportedEncodingException {
String province = request.getParameter("province"); String province = request.getParameter("province");
System.out.println("province: " + province);
String[] warningid = warningIdTwo.split(",|,"); //将传过来的以分号分隔的id字符串拆分成一个个的id并存到数组中 String[] warningid = warningIdTwo.split(",|,"); //将传过来的以分号分隔的id字符串拆分成一个个的id并存到数组中
List<String> warnId = changeStrToList(warningid);
List<GjfxRelatedInsideWorkingOrder> related = gjfxRelatedInsideWorkingOrderDao.findAllByWarningIdIn(warnId);
Long relatedId = null;
String returninfo="";
if(related.size()!=0){
for (GjfxRelatedInsideWorkingOrder aRelated : related) {
relatedId = aRelated.getInnerWorkingOrderId();
}
}
if(relatedId !=null){
returninfo="已经创建过内部协查单 协查单单编码：";
return "redirect:/MonitorOperation/InsideXcd?returninfo=" + java.net.URLEncoder.encode(returninfo,"utf-8")+"&relatedId="+relatedId;
}else{
System.out.println("@@@@@@@@@@@");
gjfxWarningInfoService.warningStatusGjfxDetailInfo('3', warnId);
System.out.println("@@@@@@@@@@@");
// gjfxWarningInfoService.updateRelXcdIdByWarningId('2', workingId, warningids);
String xcdtitle = "";//9 String xcdtitle = "";//9
String xcddescription = "";//10 String xcddescription = "";//10
String xcdprovince = "";//1 String xcdprovince = "";//1
...@@ -758,7 +763,7 @@ public class WorkingOrderCreateController { ...@@ -758,7 +763,7 @@ public class WorkingOrderCreateController {
); );
xcdWorkingOrderInfoService.saveInsideXcdInfo(info); //vertica有自动增长 xcdWorkingOrderInfoService.saveInsideXcdInfo(info); //vertica有自动增长
List<String> warnId = changeStrToList(warningid);
Long workingId = info.getInnerWorkingOrderId(); Long workingId = info.getInnerWorkingOrderId();
try { try {
...@@ -777,10 +782,16 @@ public class WorkingOrderCreateController { ...@@ -777,10 +782,16 @@ public class WorkingOrderCreateController {
gjfxRelatedInsideWorkingOrderDao.save(gjfxRelatedInsideWorkingOrder); gjfxRelatedInsideWorkingOrderDao.save(gjfxRelatedInsideWorkingOrder);
} }
String returninfo = "创建内部协查单成功，协查单单编码：" + workingId; returninfo = "创建内部协查单成功，协查单单编码：" + workingId;
return "redirect:/MonitorOperation/WorkingOrderManage?returninfo=" + java.net.URLEncoder.encode(returninfo,"utf-8"); return "redirect:/MonitorOperation/WorkingOrderManage?returninfo=" + java.net.URLEncoder.encode(returninfo,"utf-8");
}
} }
......
src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag
View file @ 1a4c46a4
...@@ -7,10 +7,11 @@ ...@@ -7,10 +7,11 @@
<div id="ws2" class="slide-menu-option"> <div id="ws2" class="slide-menu-option">
<label>告警状态</label> <!-- <div class="slide-select"> --> <label>告警状态</label> <!-- <div class="slide-select"> -->
<select class="slide-menu-select" id="relStatus" name="relStatus"> <select class="slide-menu-select" id="relStatus" name="relStatus">
<option value="未确认,已确认,已关联协查单" title="全部"selected ><a href="#">全部</a></option> <option value="未确认,已确认,已关联协查单,已关联内部协查单" title="全部"selected ><a href="#">全部</a></option>
<option value="未确认" title="未确认"><a href="#">未确认</a></option> <option value="未确认" title="未确认"><a href="#">未确认</a></option>
<option value="已确认" title="已确认"><a href="#">已确认</a></option> <option value="已确认" title="已确认"><a href="#">已确认</a></option>
<option value="已关联协查单" title="已关联协查单"><a href="#">已关联协查单</a></option> <option value="已关联协查单" title="已关联协查单"><a href="#">已关联协查单</a></option>
<option value="已关联内部协查单" title="已关联内部协查单"><a href="#">已关联内部协查单</a></option>
</select> </select>
<!-- </div> --> <!-- </div> -->
</div> </div>
......
src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcd.jsp
View file @ 1a4c46a4
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
<div class="table-header">协查单列表 <div class="table-header">协查单列表
<shiro:hasAnyRoles name="admin,dataAnalysis,businessAnalysis"> <shiro:hasAnyRoles name="admin,dataAnalysis,businessAnalysis">
<div class="bt-list-import" > <div class="bt-list-import" >
<input type="button" id="createXcd"class="btn btn-primary" style="margin-right:13px;" value="下发协查单" disabled=true onclick=""> <input type="button" id="createXcd" class="btn btn-primary" style="margin-right:13px;" value="下发协查单" disabled=true onclick="">
</div> </div>
</shiro:hasAnyRoles> </shiro:hasAnyRoles>
</div> </div>
...@@ -186,10 +186,10 @@ ...@@ -186,10 +186,10 @@
$(function(){ $(function(){
//初始化 //初始化
xcdFindTable(); xcdFindTable();
initDate() initDate();
//筛选项提交按钮 //筛选项提交按钮
$("#submit").click(function(){ $("#submit").click(searchTable);
function searchTable(){
var href; var href;
if($('#workingOrderID').val()==null||$('#workingOrderID').val()==""){//协查单编号为空 if($('#workingOrderID').val()==null||$('#workingOrderID').val()==""){//协查单编号为空
if(getStatsDataSourceCheckedValues().length==0){ $.alert('数据来源选择不能为空！');} if(getStatsDataSourceCheckedValues().length==0){ $.alert('数据来源选择不能为空！');}
...@@ -237,8 +237,72 @@ ...@@ -237,8 +237,72 @@
}); });
} }
}
function getUrlParams() {
//获取当前URL地址
var search = window.location.search;
//从search中抽取从 1 开始到search.length字符，并以&分割获取写入字符串
var tmparray = search.substr(1, search.length).split("&");
var paramsArray = new Array;
if (tmparray != null) {
for (var i = 0; i < tmparray.length; i++) {
// 用=进行拆分，但不包括==
var reg = /[=|^==]/;
//用&替换reg
var set1 = tmparray[i].replace(reg, '&');
//以&分割获取
var tmpStr2 = set1.split('&');
var array = new Array;
array[tmpStr2[0]] = tmpStr2[1];
// 将array添加到paramsArray中，并返回长度
paramsArray.push(array);
}
}
// 返回参数数组
return paramsArray;
}
//根据参数名称获取参数值
function getParamValue(name) {
var paramsArray = getUrlParams();
if (paramsArray != null) {
for (var i = 0 ; i < paramsArray.length ; i++) {
for (var j in paramsArray[i]) {
if (j == name) {
return paramsArray[i][j];
}
}
}
}
return null;
}
var returninfo2;
returninfo2=getParamValue("returninfo");
var relatedId = getParamValue("relatedId");
if(returninfo2!=null){
$.alert(decodeURIComponent(returninfo2)+relatedId);
}
if(relatedId !=null){
$('#workingOrderID').val(relatedId);
searchTable();
toggleMenu('slidePushMenus');//隐藏筛选项
}
}); });
$("#createXcd").click(function(){
console.log(xcdId)
var xcdids = xcdId.split(",");
var msg ="";
for(var i=0;i<xcdids.length;i++) {
if (i == xcdids.length - 1) {
msg += "$"
} else {
msg += "$,"
}
}
openwin("${ctx}/MonitorOperation/WorkingOrderCreate?warningId="+xcdId+"&msg="+msg);
}); });
function getCol(json,name){return (json[name]!=null)?json[name]:'';}//防止空值时出现undefined function getCol(json,name){return (json[name]!=null)?json[name]:'';}//防止空值时出现undefined
function batchOpenDialog(ids) { function batchOpenDialog(ids) {
...@@ -358,7 +422,15 @@ ...@@ -358,7 +422,15 @@
form.appendTo('body').submit().remove(); form.appendTo('body').submit().remove();
} }
function openwin(url) {
var a = document.createElement("a"); //创建a对象
a.setAttribute("href", url);
a.setAttribute("target", "_blank");
a.setAttribute("id", "camnpr");
document.body.appendChild(a);
a.click(); //执行当前对象
}
</script> </script>
......
src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp
View file @ 1a4c46a4
...@@ -408,7 +408,6 @@ ...@@ -408,7 +408,6 @@
if(json[i].provinceId!=json[j].provinceId){ if(json[i].provinceId!=json[j].provinceId){
m++; m++;
} }
} }
} }
for(var p=0;p<json.length;p++){ for(var p=0;p<json.length;p++){
...@@ -1006,13 +1005,11 @@ th{ ...@@ -1006,13 +1005,11 @@ th{
var returninfo2; var returninfo2;
returninfo2=getParamValue("returninfo"); returninfo2=getParamValue("returninfo");
console.log(returninfo2)
if(returninfo2!=null){ if(returninfo2!=null){
$.alert(decodeURIComponent(returninfo2)); $.alert(decodeURIComponent(returninfo2));
} }
}); });
......
src/main/webapp/static/js/insideXcdWarningTable.js
View file @ 1a4c46a4
...@@ -575,8 +575,17 @@ function radioChoose(clickObj){ ...@@ -575,8 +575,17 @@ function radioChoose(clickObj){
if(clickObj.checked){ if(clickObj.checked){
//alert(clickObj); //alert(clickObj);
//alert(clickObj.nextSibling.innerHTML); //alert(clickObj.nextSibling.innerHTML);
$("#updateButton").attr("disabled", false); $("#createXcd").attr("disabled", false);
xcdId=parseInt(obj[parseInt(clickObj.nextSibling.innerHTML)].workingOrderId); xcdId="";
var warningDataArr = obj[parseInt(clickObj.nextSibling.innerHTML)].alarmListRelation;
warningDataArr.forEach(function (t,i) {
if(i==warningDataArr.length-1){
xcdId +=t.warningId
}else{
xcdId +=t.warningId+","
}
});
// xcdId=parseInt(obj[parseInt(clickObj.nextSibling.innerHTML)].workingOrderId);
} }
} }
......
src/main/webapp/static/js/xcdWarningTable.js
View file @ 1a4c46a4
...@@ -332,6 +332,8 @@ table_pagging.prototype = { ...@@ -332,6 +332,8 @@ table_pagging.prototype = {
tr.className="green-tr"; tr.className="green-tr";
}else if(tdContext=="已关联协查单"){ }else if(tdContext=="已关联协查单"){
tr.className="blue-tr"; tr.className="blue-tr";
}else if(tdContext == "已关联内部协查单"){
tr.className="orange-tr";
}else{ }else{
tr.className="white-tr"; tr.className="white-tr";
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment