Skip to content

C
cmszMonitorAnalysis
Commit 25f2cdf0 authored by afe's avatar afe
Browse files
Options

模型监控增加字段，增加添加修改模型参数

模型预览完成
parent 009b18e1
Hide whitespace changes
Inline Side-by-side
Showing with 1458 additions and 705 deletions
.gitignore
View file @ 25f2cdf0
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
### Example user template ### Example user template
# IntelliJ project files # IntelliJ project files
.idea
*.iml *.iml
out out
gen gen
......
.idea/misc.xml
View file @ 25f2cdf0
...@@ -3,6 +3,13 @@ ...@@ -3,6 +3,13 @@
<component name="JavaScriptSettings"> <component name="JavaScriptSettings">
<option name="languageLevel" value="ES5" /> <option name="languageLevel" value="ES5" />
</component> </component>
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" project-jdk-name="1.6" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" project-jdk-name="1.6" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
......
.idea/workspace.xml
View file @ 25f2cdf0
...@@ -6,19 +6,58 @@ ...@@ -6,19 +6,58 @@
</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=""> <list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="Merge remote-tracking branch 'monitorAnalysis/liuna'&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ChannelDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/BusinessService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$1.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$2.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$3.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$4.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/EWarningCalcResult.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/commonmanage/APPEWarningDetailDao.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/commonmanage/EWarningCalcResultDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/CmszMonitorAnalysis.war" afterPath="$PROJECT_DIR$/CmszMonitorAnalysis.war" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CmszMonitorAnalysis.war" afterPath="$PROJECT_DIR$/CmszMonitorAnalysis.war" />
<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="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/Business.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/Business.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/Channel.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/Channel.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/DataSource.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/DataSource.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/InsideXcdWorkingOrderInfo.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/InsideXcdWorkingOrderInfo.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/ModelParameter.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/ModelParameter.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/commonmanage/RunTask.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/commonmanage/RunTask.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/BusinessDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/BusinessDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/ChannelDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/ChannelDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/KpiDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/KpiDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/ModelParameterDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/ModelParameterDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/service/BusinessService.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/service/BusinessService.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/PageURLController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/PageURLController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/commonmanage/TaskManageController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/commonmanage/TaskManageController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/modelmanage/ModelMaintainController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/modelmanage/ModelMaintainController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Business.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Business.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Channel.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Channel.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/DataSource.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/DataSource.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/commonmanage/RunTask.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/commonmanage/RunTask.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ModelParameterDao.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ModelParameterDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/commonmanage/TaskManageController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/commonmanage/TaskManageController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<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/entity/APPEWarningDetail.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/APPEWarningDetail.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/java/com/hp/cmsz/entity/Business.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Business.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/java/com/hp/cmsz/entity/Channel.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Channel.java" />
<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/java/com/hp/cmsz/entity/DataSource.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataSource.java" />
<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/java/com/hp/cmsz/entity/DimKpi.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DimKpi.java" />
<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/java/com/hp/cmsz/entity/commonmanage/RunTask.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/DimKpiDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/DimKpiDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ModelParameterDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ModelParameterDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/DimKpiService.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/DimKpiService.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/error/500.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/error/500.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/validation.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/validation.js" />
</list> </list>
<ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" /> <ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -30,7 +69,58 @@ ...@@ -30,7 +69,58 @@
<option name="refreshEnabled" value="true" /> <option name="refreshEnabled" value="true" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" /> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="TaskManageController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5368">
<caret line="275" column="40" lean-forward="false" selection-start-line="275" selection-start-column="33" selection-end-line="275" selection-end-column="40" />
<folding>
<element signature="imports" expanded="true" />
<element signature="method#submitTaskFrame#0;class#TaskManageController#0" expanded="false" />
<element signature="method#taskDeleteFrame#0;class#TaskManageController#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ModelParameter.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/ModelParameter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="22" column="28" lean-forward="false" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="RunTaskForm.jsp" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="138" column="41" lean-forward="true" selection-start-line="138" selection-start-column="41" selection-end-line="138" selection-end-column="41" />
<folding>
<element signature="n#c:forEach#0;n#jsp:root#0;n#!!top" expanded="false" />
<element signature="n#c:forEach#1;n#jsp:root#0;n#!!top" expanded="false" />
<element signature="n#c:forEach#2;n#jsp:root#0;n#!!top" expanded="false" />
<element signature="n#c:forEach#3;n#jsp:root#0;n#!!top" expanded="false" />
<element signature="n#c:forEach#7;n#jsp:root#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="validation.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/validation.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2464">
<caret line="112" column="18" lean-forward="false" selection-start-line="112" selection-start-column="11" selection-end-line="112" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
...@@ -43,36 +133,36 @@ ...@@ -43,36 +133,36 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>k==7</find> <find>taskId</find>
<find>create</find> <find>kpiId</find>
<find>xcdWarningInfoViewService</find> <find>provinceId</find>
<find>glyphicon-class</find> <find>provinceView</find>
<find>style</find> <find>channelStatus</find>
<find>exportWord</find> <find>DimKpiView</find>
<find>createForm</find> <find>preview</find>
<find>upload</find> <find>getModelParameterList</find>
<find>window.open</find> <find>queryResultFrame</find>
<find>header[7]</find> <find>location</find>
<find>console.log</find> <find>rserv</find>
<find>==</find> <find>RC</find>
<find>viewAction</find> <find>perl</find>
<find>pentaho/view</find> <find>RConnection</find>
<find>biserver_config</find> <find>for</find>
<find>initDate</find> <find>taskContext</find>
<find>/home/hg</find> <find>format</find>
<find>新建</find> <find>forma</find>
<find>GJFX_warni</find> <find>ewarning</find>
<find>XcdChangeOrderDao</find> <find>taskFormFrame</find>
<find>XcdChangeOrderService</find> <find>taskDeleteFrame</find>
<find>createInsideWorkingOrder</find> <find>dialog</find>
<find>内部</find> <find>taskListFrame</find>
<find>updateRelXcdIdByWarningId</find> <find>FXJM_DATA_MODEL_INFO_T</find>
<find>warningId</find> <find>run_task_t</find>
<find>下发协查单</find> <find>.APP_EWARNING_CALC_RESULT_T</find>
<find>returninfo</find> <find>dataModelParameterList</find>
<find>getUrlParams</find> <find>\n</find>
<find>green-tr</find> <find>submitForm</find>
<find>update</find> <find>addTr</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>InsideXcdWorkingOrderInfoView</replace> <replace>InsideXcdWorkingOrderInfoView</replace>
...@@ -95,23 +185,6 @@ ...@@ -95,23 +185,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/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/resources/application.properties" />
<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/views/ModelManage/ModelResult.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WarnAnalysis.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/PageURLController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderReasult.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdWorkingOrderInfo.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcd.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcdTable.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WarnAnalysisDetail.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/fop-1.1.jar!/org/apache/fop/afp/AFPEventProducer.class" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/ModelDataType.tag" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningSource.tag" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningSource.tag" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/commonutils.js" /> <option value="$PROJECT_DIR$/src/main/webapp/static/js/commonutils.js" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoT.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoT.java" />
...@@ -125,7 +198,6 @@ ...@@ -125,7 +198,6 @@
<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$/.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/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoViewService.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoViewService.java" />
...@@ -140,6 +212,30 @@ ...@@ -140,6 +212,30 @@
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag" /> <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/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$/.gitignore" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DimKpi.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/DimKpiDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/DimKpiService.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar!/javax/persistence/JoinColumn.class" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar!/javax/persistence/ManyToOne.class" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/commonmanage/APPEWarningDetailDao.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/error/500.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/Task.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Channel.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataSource.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Business.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ModelParameterDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/APPEWarningDetail.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/EWarningCalcResult.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/commonmanage/EWarningCalcResultDao.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/validation.js" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp" />
</list> </list>
</option> </option>
</component> </component>
...@@ -165,7 +261,21 @@ ...@@ -165,7 +261,21 @@
</component> </component>
<component name="MavenProjectNavigator"> <component name="MavenProjectNavigator">
<treeState> <treeState>
<expand /> <expand>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="Profiles" type="6783ec58:MavenProjectsStructure$ProfilesNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="CmszMonitorAnalysis" type="9519ce18:MavenProjectsStructure$ProjectNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="CmszMonitorAnalysis" type="9519ce18:MavenProjectsStructure$ProjectNode" />
<item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
</path>
</expand>
<select /> <select />
</treeState> </treeState>
</component> </component>
...@@ -192,7 +302,6 @@ ...@@ -192,7 +302,6 @@
</navigator> </navigator>
<panes> <panes>
<pane id="AndroidView" /> <pane id="AndroidView" />
<pane id="Scope" />
<pane id="Scratches" /> <pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
...@@ -204,12 +313,43 @@ ...@@ -204,12 +313,43 @@
<path> <path>
<item name="trunk" type="b2602c69:ProjectViewProjectNode" /> <item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" type="462c0819:PsiDirectoryNode" /> <item name="trunk" type="462c0819:PsiDirectoryNode" />
<item name="数据库脚本" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="cmsz" type="462c0819:PsiDirectoryNode" />
</path> </path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
<pane id="PackagesPane" /> <pane id="PackagesPane" />
</panes> </panes>
</component> </component>
...@@ -219,8 +359,8 @@ ...@@ -219,8 +359,8 @@
<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$/../../../大屏前台/http" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="settings.editor.selected.configurable" value="Settings.JavaScript" /> <property name="settings.editor.selected.configurable" value="preferences.externalDependencies" />
<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" />
<property name="jsx.switch.disabled" value="true" /> <property name="jsx.switch.disabled" value="true" />
...@@ -457,6 +597,15 @@ ...@@ -457,6 +597,15 @@
<workItem from="1510044948539" duration="32189000" /> <workItem from="1510044948539" duration="32189000" />
<workItem from="1510981253246" duration="11664000" /> <workItem from="1510981253246" duration="11664000" />
<workItem from="1511142387727" duration="53000" /> <workItem from="1511142387727" duration="53000" />
<workItem from="1511513928497" duration="44022000" />
<workItem from="1511669191946" duration="5984000" />
<workItem from="1511746960590" duration="3338000" />
<workItem from="1511752842702" duration="2067000" />
<workItem from="1511765970234" duration="2783000" />
<workItem from="1511769485821" duration="12663000" />
<workItem from="1511782876195" duration="4401000" />
<workItem from="1511839089264" duration="2725000" />
<workItem from="1511851026158" duration="149000" />
</task> </task>
<task id="LOCAL-00001" summary="first commit"> <task id="LOCAL-00001" summary="first commit">
<created>1507828551888</created> <created>1507828551888</created>
...@@ -528,50 +677,102 @@ ...@@ -528,50 +677,102 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1510162965813</updated> <updated>1510162965813</updated>
</task> </task>
<option name="localTasksCounter" value="11" /> <task id="LOCAL-00011" summary="Merge remote-tracking branch 'monitorAnalysis/liuna'&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ChannelDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/BusinessService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$1.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$2.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$3.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$4.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class">
<created>1511514153214</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1511514153214</updated>
</task>
<option name="localTasksCounter" value="12" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="213873000" /> <option name="totallyTimeSpent" value="292005000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
<is-autoscroll-to-source value="true" />
</todo-panel>
<todo-panel id="all">
<are-packages-shown value="true" />
<is-autoscroll-to-source value="true" />
</todo-panel>
</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="1380" height="744" 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="4" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.58388156" sideWeight="0.5060606" order="8" side_tool="true" content_ui="tabs" /> <window_info id="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.32730263" 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="16" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" 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="IvyIDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="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="6" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="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="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.39802632" 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.32837838" sideWeight="0.5" order="6" 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="11" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.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.27467105" 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.7582237" sideWeight="0.4939394" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.66611844" 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.32730263" 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.2377892" 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.24469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> <window_info id="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="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="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="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="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="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="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32072368" sideWeight="0.5" order="10" 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="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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout> </layout>
<layout-to-restore>
<window_info id="SVN Repositories" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.58388156" sideWeight="0.5060606" order="8" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" 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.32954547" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="IvyIDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="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.39802632" 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.32837838" 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.32072368" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27467105" 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.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.32730263" 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.24469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
</layout-to-restore>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" /> <option name="version" value="1" />
...@@ -626,7 +827,9 @@ ...@@ -626,7 +827,9 @@
<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; --验收通过" />
<MESSAGE value="2017年11月09 智能分析平台提交内容&#10; --数据库脚本更新" /> <MESSAGE value="2017年11月09 智能分析平台提交内容&#10; --数据库脚本更新" />
<option name="LAST_COMMIT_MESSAGE" value="2017年11月09 智能分析平台提交内容&#10; --数据库脚本更新" /> <MESSAGE value="Merge remote-tracking branch 'monitorAnalysis/liuna'&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ChannelDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/BusinessService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$1.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$2.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$3.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$4.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class" />
<MESSAGE value="模型监控增加字段，增加添加修改模型参数&#10;模型预览完成" />
<option name="LAST_COMMIT_MESSAGE" value="模型监控增加字段，增加添加修改模型参数&#10;模型预览完成" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -655,376 +858,413 @@ ...@@ -655,376 +858,413 @@
</buildFile> </buildFile>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/FXJM_modelResult_DataModelTypeTag.tag"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdChangeView.java">
<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="238">
<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="34" column="53" lean-forward="true" selection-start-line="33" selection-start-column="3" selection-end-line="34" selection-end-column="53" />
</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/commonmanage/BaseDataDao.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="220">
<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="13" column="115" lean-forward="false" selection-start-line="13" selection-start-column="29" selection-end-line="13" selection-end-column="115" />
</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/webapp/static/artDialog4.1.7/_doc/highlight/readme.eng.txt">
<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="194">
<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="131" column="0" lean-forward="false" selection-start-line="131" selection-start-column="0" selection-end-line="131" 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/java/com/hp/cmsz/web/monitoroperation/WarnAnalysisController.java">
<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="194">
<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="86" column="13" lean-forward="false" selection-start-line="86" selection-start-column="13" selection-end-line="86" selection-end-column="13" />
</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$/src/main/java/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.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="-5726">
<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="83" column="13" lean-forward="false" selection-start-line="83" selection-start-column="13" selection-end-line="83" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_FocusDataDao.java"> <entry file="jar://$PROJECT_DIR$/../../jdk1.6.0_18/jre/lib/rt.jar!/java/lang/ClassLoader.class">
<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="113">
<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="122" column="38" lean-forward="false" selection-start-line="122" selection-start-column="38" selection-end-line="122" selection-end-column="38" />
</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/commons/utils/PropertiesUtil.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="223">
<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="18" column="35" lean-forward="false" selection-start-line="18" selection-start-column="35" selection-end-line="18" selection-end-column="35" />
</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/java/com/hp/cmsz/commons/utils/CommonUtil.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="135">
<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="251" column="60" lean-forward="true" selection-start-line="251" selection-start-column="60" selection-end-line="251" selection-end-column="60" />
</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$/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="198"> <state relative-caret-position="-1207">
<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="207" column="49" lean-forward="false" selection-start-line="207" selection-start-column="49" selection-end-line="207" selection-end-column="49" />
</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/webapp/static/js/failureAnalysisDetailTable.js">
<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="352">
<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="16" column="35" lean-forward="false" selection-start-line="16" selection-start-column="35" selection-end-line="16" selection-end-column="35" />
</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/web/modelmanage/ModelResultController.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="252">
<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="336" column="30" lean-forward="true" selection-start-line="336" selection-start-column="30" selection-end-line="336" selection-end-column="30" />
</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/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="176"> <state relative-caret-position="238">
<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="818" column="36" lean-forward="false" selection-start-line="818" selection-start-column="36" selection-end-line="818" selection-end-column="36" />
</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/webapp/WEB-INF/views/MonitorOperation/WarnAnalysisDetail.jsp">
<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="-375">
<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="280" column="1045" lean-forward="true" selection-start-line="280" selection-start-column="1045" selection-end-line="280" selection-end-column="1045" />
</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/webapp/static/js/xcdChangeTable.js">
<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="440">
<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="26" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.gitignore"> <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="396"> <state relative-caret-position="238">
<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="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
</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/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="351"> <state relative-caret-position="-4506">
<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="124" column="0" lean-forward="false" selection-start-line="124" selection-start-column="0" selection-end-line="125" selection-end-column="40" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/default.jsp"> <entry file="jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/resources/html5-schema/html5/web-forms.rnc">
<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="194">
<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="503" column="16" lean-forward="false" selection-start-line="503" selection-start-column="16" selection-end-line="503" selection-end-column="16" />
</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/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="478"> <state relative-caret-position="22">
<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="1177" column="0" lean-forward="false" selection-start-line="1177" selection-start-column="0" selection-end-line="1177" selection-end-column="0" />
</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/webapp/static/artDialog4.1.7/jquery.artDialog.source.js">
<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="260">
<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="878" column="0" lean-forward="false" selection-start-line="878" selection-start-column="0" selection-end-line="878" selection-end-column="0" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/build.xml"> <entry file="jar://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/lib/JavaScriptLanguage.jar!/com/intellij/lang/javascript/index/predefined/DHTML.js">
<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="194">
<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="1382" column="0" lean-forward="false" selection-start-line="1382" selection-start-column="0" selection-end-line="1382" selection-end-column="0" />
<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="jar://$PROJECT_DIR$/../../jdk1.6.0_18/jre/lib/rt.jar!/java/lang/Throwable.class">
<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="110">
<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="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</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/web.xml">
<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="4004">
<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="182" column="4" lean-forward="false" selection-start-line="182" selection-start-column="4" selection-end-line="182" 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/error/500.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="220">
<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="10" column="14" lean-forward="false" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
</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/entity/DataModel.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="264">
<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="20" column="15" lean-forward="false" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderDetailController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1720"> <state relative-caret-position="0">
<caret line="64" column="13" lean-forward="false" selection-start-line="64" selection-start-column="13" selection-end-line="64" 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" />
<folding>
<element signature="imports" expanded="true" />
<element signature="method#submitTaskFrame#0;class#TaskManageController#0" expanded="false" />
<element signature="method#taskDeleteFrame#0;class#TaskManageController#0" expanded="false" />
</folding>
</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/entity/commonmanage/RunTaskDetail.java">
<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="129">
<caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="39" /> <caret line="24" column="13" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" 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/entity/commonmanage/TaskType.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="132">
<caret line="37" column="32" lean-forward="false" selection-start-line="37" selection-start-column="32" selection-end-line="37" selection-end-column="32" /> <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdChangeOrder.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/commonmanage/RunTaskService.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="-66">
<caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" /> <caret line="134" column="29" lean-forward="false" selection-start-line="134" selection-start-column="19" selection-end-line="134" selection-end-column="29" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WarnAnalysisDetailController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskDetailManageController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2112"> <state relative-caret-position="242">
<caret line="79" column="41" lean-forward="false" selection-start-line="79" selection-start-column="13" selection-end-line="79" selection-end-column="41" /> <caret line="11" column="41" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="53" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdChangeOrderDao.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/commons/filter/SSOFilter.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="308">
<caret line="18" column="34" lean-forward="false" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="34" /> <caret line="38" column="47" lean-forward="false" selection-start-line="38" selection-start-column="47" selection-end-line="38" selection-end-column="47" />
</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/java/com/hp/cmsz/entity/Channel.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="282">
<caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" /> <caret line="32" column="0" lean-forward="false" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
</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/entity/Business.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88"> <state relative-caret-position="84">
<caret line="8" column="90" lean-forward="false" selection-start-line="8" selection-start-column="90" selection-end-line="8" selection-end-column="90" /> <caret line="15" column="19" lean-forward="false" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdChangeOrderService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataSource.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-248"> <state relative-caret-position="392">
<caret line="23" column="34" lean-forward="false" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="34" /> <caret line="31" column="0" lean-forward="false" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
</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$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186"> <state relative-caret-position="198">
<caret line="49" column="33" lean-forward="true" selection-start-line="49" selection-start-column="33" selection-end-line="49" selection-end-column="33" /> <caret line="15" column="117" lean-forward="false" selection-start-line="15" selection-start-column="117" selection-end-line="15" selection-end-column="117" />
<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/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="307"> <state relative-caret-position="406">
<caret line="323" column="87" lean-forward="false" selection-start-line="323" selection-start-column="69" selection-end-line="323" selection-end-column="87" /> <caret line="146" column="11" lean-forward="false" selection-start-line="146" selection-start-column="11" selection-end-line="146" selection-end-column="11" />
<folding />
</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/ModelParameterDao.java">
<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="236">
<caret line="586" column="11" lean-forward="true" selection-start-line="586" selection-start-column="11" selection-end-line="586" selection-end-column="11" /> <caret line="37" column="55" lean-forward="false" selection-start-line="37" selection-start-column="25" selection-end-line="37" selection-end-column="55" />
</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/commonmanage/EWarningDropRule.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="116"> <state relative-caret-position="330">
<caret line="33" column="16" lean-forward="false" selection-start-line="33" selection-start-column="16" selection-end-line="33" selection-end-column="16" /> <caret line="25" column="39" lean-forward="true" selection-start-line="18" selection-start-column="4" selection-end-line="25" selection-end-column="39" />
</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/java/com/hp/cmsz/entity/FailureAttachment.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-532"> <state relative-caret-position="194">
<caret line="83" column="13" lean-forward="false" selection-start-line="83" selection-start-column="13" selection-end-line="83" selection-end-column="13" /> <caret line="18" column="13" lean-forward="false" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
</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/java/com/hp/cmsz/entity/commonmanage/RunTask.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="-66">
<caret line="9" column="114" lean-forward="false" selection-start-line="9" selection-start-column="85" selection-end-line="9" selection-end-column="114" /> <caret line="24" column="13" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
<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/java/com/hp/cmsz/entity/AppData.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1826"> <state relative-caret-position="194">
<caret line="118" column="41" lean-forward="false" selection-start-line="118" selection-start-column="30" selection-end-line="118" selection-end-column="41" /> <caret line="17" column="13" lean-forward="false" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderReasult.jsp"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/commonmanage/APPEWarningDetailDao.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="88">
<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="6" column="79" lean-forward="false" selection-start-line="6" selection-start-column="79" selection-end-line="6" selection-end-column="79" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningStatus.tag"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/commonmanage/DataBackupDao.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="242">
<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="14" column="44" lean-forward="true" selection-start-line="13" selection-start-column="31" selection-end-line="14" selection-end-column="44" />
</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/java/com/hp/cmsz/entity/commonmanage/EWarningCalcResult.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186"> <state relative-caret-position="418">
<caret line="334" column="62" lean-forward="true" selection-start-line="334" selection-start-column="62" selection-end-line="334" selection-end-column="62" /> <caret line="38" column="18" lean-forward="false" selection-start-line="38" selection-start-column="18" selection-end-line="38" selection-end-column="18" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/GjfxWarningInfo.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/APPEWarningDetail.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="172"> <state relative-caret-position="250">
<caret line="22" column="34" lean-forward="false" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="34" /> <caret line="137" column="27" lean-forward="true" selection-start-line="137" selection-start-column="27" selection-end-line="137" selection-end-column="27" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxWarningInfoDao.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="164"> <state relative-caret-position="-13">
<caret line="31" column="60" lean-forward="false" selection-start-line="31" selection-start-column="47" selection-end-line="31" selection-end-column="60" /> <caret line="83" column="19" lean-forward="false" selection-start-line="83" selection-start-column="14" selection-end-line="83" selection-end-column="19" />
<folding>
<marker date="1511832638212" expanded="true" signature="2688:2744" ph="..." />
<marker date="1511832638212" expanded="true" signature="2972:2983" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/commonmanage/EWarningCalcResultDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352"> <state relative-caret-position="154">
<caret line="22" column="20" lean-forward="true" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" /> <caret line="11" column="55" lean-forward="false" selection-start-line="11" selection-start-column="33" selection-end-line="11" selection-end-column="55" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp"> <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="93"> <state relative-caret-position="194">
<caret line="25" column="4" lean-forward="true" selection-start-line="25" selection-start-column="4" selection-end-line="25" selection-end-column="4" /> <caret line="55" column="0" lean-forward="false" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
</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/webapp/static/js/validation.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="8"> <state relative-caret-position="2464">
<caret line="286" column="48" lean-forward="false" selection-start-line="286" selection-start-column="48" selection-end-line="286" selection-end-column="48" /> <caret line="112" column="18" lean-forward="false" selection-start-line="112" selection-start-column="11" selection-end-line="112" selection-end-column="18" />
<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/web/commonmanage/TaskManageController.java">
<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="5368">
<caret line="685" column="51" lean-forward="false" selection-start-line="685" selection-start-column="51" selection-end-line="685" selection-end-column="51" /> <caret line="275" column="40" lean-forward="false" selection-start-line="275" selection-start-column="33" selection-end-line="275" selection-end-column="40" />
<folding>
<element signature="imports" expanded="true" />
<element signature="method#submitTaskFrame#0;class#TaskManageController#0" expanded="false" />
<element signature="method#taskDeleteFrame#0;class#TaskManageController#0" expanded="false" />
</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/java/com/hp/cmsz/entity/ModelParameter.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="208"> <state relative-caret-position="330">
<caret line="28" column="39" lean-forward="false" selection-start-line="28" selection-start-column="39" selection-end-line="28" selection-end-column="39" /> <caret line="22" column="28" lean-forward="false" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="28" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/css/styles.css"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22"> <state relative-caret-position="176">
<caret line="854" column="16" lean-forward="false" selection-start-line="854" selection-start-column="7" selection-end-line="854" selection-end-column="16" /> <caret line="138" column="41" lean-forward="true" selection-start-line="138" selection-start-column="41" selection-end-line="138" selection-end-column="41" />
<folding /> <folding>
<element signature="n#c:forEach#0;n#jsp:root#0;n#!!top" expanded="false" />
<element signature="n#c:forEach#1;n#jsp:root#0;n#!!top" expanded="false" />
<element signature="n#c:forEach#2;n#jsp:root#0;n#!!top" expanded="false" />
<element signature="n#c:forEach#3;n#jsp:root#0;n#!!top" expanded="false" />
<element signature="n#c:forEach#7;n#jsp:root#0;n#!!top" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>
<state key="ArquillianSettingsConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ArtifactsStructureConfigurable.UI"> <state key="ArtifactsStructureConfigurable.UI">
<settings> <settings>
<artifact-editor> <artifact-editor>
<show-content> <show-content>
<type id="artifact" />
<type id="javaee-facet-resources" />
<type id="library" /> <type id="library" />
<type id="artifact" />
<type id="jpa-descriptors" /> <type id="jpa-descriptors" />
<type id="javaee-facet-resources" />
</show-content> </show-content>
</artifact-editor> </artifact-editor>
<last-edited>CmszMonitorAnalysis</last-edited> <last-edited>CmszMonitorAnalysis</last-edited>
......
CmszMonitorAnalysis.war
View file @ 25f2cdf0
No preview for this file type
src/main/java/com/hp/cmsz/entity/APPEWarningDetail.java
View file @ 25f2cdf0
//package com.hp.cmsz.entity; package com.hp.cmsz.entity;
//
//import javax.persistence.Entity; import com.hp.cmsz.entity.commonmanage.EWarningCalcResult;
//import javax.persistence.Table;
// import javax.persistence.*;
//@Entity import java.sql.Timestamp;
//@Table(name="etl.APP_EWARNING_DETAIL_T") import java.util.List;
//public class APPEWarningDetail {
// private Long EwarningDetailId; @Entity
//// private Long EwarningDetailId; @Table(name="Model_Preview_v",schema = "ccolap")
// public class APPEWarningDetail {
// private Long ewarningDetailId;
// private String provinceName;
//} private String datasourceName;
private String busname;
private String channelName;
private String kpiName;
private String kpiCode;
private Timestamp busdatabegTime;
private Timestamp busdataendTime;
private String threshold1Val;
private String threshold2Val;
private String threshold3Val;
private String warn1Val;
private String warn2Val;
private String warn3Val;
private String fileAddress;
private List<EWarningCalcResult> eWarningCalcResult;
@Id
@GeneratedValue(strategy= GenerationType.IDENTITY)
public Long getEwarningDetailId() {
return ewarningDetailId;
}
public void setEwarningDetailId(Long ewarningDetailId) {
this.ewarningDetailId = ewarningDetailId;
}
public String getProvinceName() {
return provinceName;
}
public void setProvinceName(String provinceName) {
this.provinceName = provinceName;
}
public String getDatasourceName() {
return datasourceName;
}
public void setDatasourceName(String datasourceName) {
this.datasourceName = datasourceName;
}
public String getBusname() {
return busname;
}
public void setBusname(String busname) {
this.busname = busname;
}
public String getChannelName() {
return channelName;
}
public void setChannelName(String channelName) {
this.channelName = channelName;
}
public String getKpiName() {
return kpiName;
}
public void setKpiName(String kpiName) {
this.kpiName = kpiName;
}
public String getKpiCode() {
return kpiCode;
}
public void setKpiCode(String kpiCode) {
this.kpiCode = kpiCode;
}
public Timestamp getBusdatabegTime() {
return busdatabegTime;
}
public void setBusdatabegTime(Timestamp busdatabegTime) {
this.busdatabegTime = busdatabegTime;
}
public Timestamp getBusdataendTime() {
return busdataendTime;
}
public void setBusdataendTime(Timestamp busdataendTime) {
this.busdataendTime = busdataendTime;
}
@Column(name = "threshold1_val")
public String getThreshold1Val() {
return threshold1Val;
}
public void setThreshold1Val(String threshold1Val) {
this.threshold1Val = threshold1Val;
}
@Column(name = "threshold2_val")
public String getThreshold2Val() {
return threshold2Val;
}
public void setThreshold2Val(String threshold2Val) {
this.threshold2Val = threshold2Val;
}
@Column(name = "threshold3_val")
public String getThreshold3Val() {
return threshold3Val;
}
public void setThreshold3Val(String threshold3Val) {
this.threshold3Val = threshold3Val;
}
@Column(name = "warn1_val")
public String getWarn1Val() {
return warn1Val;
}
public void setWarn1Val(String warn1Val) {
this.warn1Val = warn1Val;
}
@Column(name = "warn2_Val")
public String getWarn2Val() {
return warn2Val;
}
public void setWarn2Val(String warn2Val) {
this.warn2Val = warn2Val;
}
@Column(name = "warn3_Val")
public String getWarn3Val() {
return warn3Val;
}
public void setWarn3Val(String warn3Val) {
this.warn3Val = warn3Val;
}
public String getFileAddress() {
return fileAddress;
}
public void setFileAddress(String fileAddress) {
this.fileAddress = fileAddress;
}
@Transient
public List<EWarningCalcResult> geteWarningCalcResult() {
return eWarningCalcResult;
}
public void seteWarningCalcResult(List<EWarningCalcResult> eWarningCalcResult) {
this.eWarningCalcResult = eWarningCalcResult;
}
}
src/main/java/com/hp/cmsz/entity/Business.java
View file @ 25f2cdf0
...@@ -34,6 +34,7 @@ public class Business implements Serializable{ ...@@ -34,6 +34,7 @@ public class Business implements Serializable{
public Long getBusinessId() { public Long getBusinessId() {
return businessId; return businessId;
} }
public void setBusinessId(Long businessId) { public void setBusinessId(Long businessId) {
this.businessId = businessId; this.businessId = businessId;
} }
......
src/main/java/com/hp/cmsz/entity/Channel.java
View file @ 25f2cdf0
...@@ -27,13 +27,13 @@ public class Channel implements Serializable{ ...@@ -27,13 +27,13 @@ public class Channel implements Serializable{
@Id @Id
@GeneratedValue(strategy=GenerationType.SEQUENCE, generator="ChannelSequence") @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="ChannelSequence")
@SequenceGenerator(name = "ChannelSequence", sequenceName = "dim_channel_info_t_seq", allocationSize=20) @SequenceGenerator(name = "ChannelSequence", sequenceName = "dim_channel_info_t_seq", allocationSize=20)
public String getChannelName() {
return channelName;
}
public Long getChannelId() { public Long getChannelId() {
return channelId; return channelId;
} }
public String getChannelName() {
return channelName;
}
public void setChannelId(Long channelId) { public void setChannelId(Long channelId) {
this.channelId = channelId; this.channelId = channelId;
} }
......
src/main/java/com/hp/cmsz/entity/DataSource.java
View file @ 25f2cdf0
...@@ -26,12 +26,14 @@ public class DataSource implements Serializable{ ...@@ -26,12 +26,14 @@ public class DataSource implements Serializable{
@Id @Id
@GeneratedValue(strategy=GenerationType.SEQUENCE, generator="DataSourceSequence") @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="DataSourceSequence")
@SequenceGenerator(name = "DataSourceSequence", sequenceName = "dim_data_source_info_t_seq", allocationSize=20) @SequenceGenerator(name = "DataSourceSequence", sequenceName = "dim_data_source_info_t_seq", allocationSize=20)
public String getDataSourceName() {
return dataSourceName;
}
public Long getDataSourceId() { public Long getDataSourceId() {
return dataSourceId; return dataSourceId;
} }
public String getDataSourceName() {
return dataSourceName;
}
public void setDataSourceId(Long dataSourceId) { public void setDataSourceId(Long dataSourceId) {
this.dataSourceId = dataSourceId; this.dataSourceId = dataSourceId;
} }
......
src/main/java/com/hp/cmsz/entity/DimKpi.java
View file @ 25f2cdf0
...@@ -18,7 +18,7 @@ import javax.persistence.Table; ...@@ -18,7 +18,7 @@ import javax.persistence.Table;
*/ */
@Entity @Entity
@Table(name = "etl.dim_kpi_t") @Table(name = "dim_kpi_t",schema = "etl")
public class DimKpi implements Serializable{ public class DimKpi implements Serializable{
/** /**
......
src/main/java/com/hp/cmsz/entity/commonmanage/EWarningCalcResult.java 0 → 100644
View file @ 25f2cdf0
package com.hp.cmsz.entity.commonmanage;
import javax.persistence.*;
import java.sql.Timestamp;
@Entity
@Table(name = "APP_EWARNING_CALC_RESULT_T", schema = "ETL")
public class EWarningCalcResult {
private Long ewarningDataresultId;
private Timestamp resultDate;
private Long dim1Val;
private Long dim2Val;
private Long ewarningDetailId;
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "EWarningCalcResultSequence")
@SequenceGenerator(name = "EWarningCalcResultSequence", sequenceName = "SEQ_APP_EWARNING_CALC_RESULT", allocationSize = 1)
public Long getEwarningDataresultId() {
return ewarningDataresultId;
}
public void setEwarningDataresultId(Long ewarningDataresultId) {
this.ewarningDataresultId = ewarningDataresultId;
}
public Timestamp getResultDate() {
return resultDate;
}
public void setResultDate(Timestamp resultDate) {
this.resultDate = resultDate;
}
@Column(name = "dim1_val")
public Long getDim1Val() {
return dim1Val;
}
public void setDim1Val(Long dim1Val) {
this.dim1Val = dim1Val;
}
@Column(name = "dim2_val")
public Long getDim2Val() {
return dim2Val;
}
public void setDim2Val(Long dim2Val) {
this.dim2Val = dim2Val;
}
public Long getEwarningDetailId() {
return ewarningDetailId;
}
public void setEwarningDetailId(Long ewarningDetailId) {
this.ewarningDetailId = ewarningDetailId;
}
}
src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java
View file @ 25f2cdf0
...@@ -53,21 +53,21 @@ public class RunTask { ...@@ -53,21 +53,21 @@ public class RunTask {
@JoinColumn(name = "province_id") @JoinColumn(name = "province_id")
private Province provinceView; private Province provinceView;
private Long kpiId; @ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "kpi_id")
private DimKpi dimKpiView;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "channel_id")
private Channel channelView;
// @ManyToOne(fetch = FetchType.EAGER) @ManyToOne(fetch = FetchType.EAGER)
// @JoinColumn(name = "channel_id") @JoinColumn(name = "data_source_id")
// private Channel channelView; private DataSource dataSourceView;
//
// @ManyToOne(fetch = FetchType.EAGER)
// @JoinColumn(name = "dataSource_id")
// private DataSource dataSourceView;
// @ManyToOne(fetch = FetchType.EAGER) @ManyToOne(fetch = FetchType.EAGER)
// @JoinColumn(name = "business_id") @JoinColumn(name = "business_id")
// private Business businessView; private Business businessView;
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
...@@ -204,37 +204,38 @@ public class RunTask { ...@@ -204,37 +204,38 @@ public class RunTask {
this.provinceView = provinceView; this.provinceView = provinceView;
} }
public Long getKpiId() { public DimKpi getDimKpiView() {
return kpiId; return dimKpiView;
} }
public void setKpiId(Long kpiId) { public void setDimKpiView(DimKpi dimKpiView) {
this.kpiId = kpiId; this.dimKpiView = dimKpiView;
} }
// public Channel getChannelView() { public Channel getChannelView() {
// return channelView; return channelView;
// } }
//
// public void setChannelView(Channel channelView) { public void setChannelView(Channel channelView) {
// this.channelView = channelView; this.channelView = channelView;
// } }
//
// public DataSource getDataSourceView() { public DataSource getDataSourceView() {
// return dataSourceView; return dataSourceView;
// } }
//
// public void setDataSourceView(DataSource dataSourceView) { public void setDataSourceView(DataSource dataSourceView) {
// this.dataSourceView = dataSourceView; this.dataSourceView = dataSourceView;
// } }
//
// public Business getBusinessView() { public Business getBusinessView() {
// return businessView; return businessView;
// } }
//
// public void setBusinessView(Business businessView) { public void setBusinessView(Business businessView) {
// this.businessView = businessView; this.businessView = businessView;
// } }
/*public String getParallelFlg() { /*public String getParallelFlg() {
return parallelFlg; return parallelFlg;
} }
......
src/main/java/com/hp/cmsz/repository/DimKpiDao.java
View file @ 25f2cdf0
...@@ -11,12 +11,15 @@ import org.springframework.data.repository.query.Param; ...@@ -11,12 +11,15 @@ import org.springframework.data.repository.query.Param;
import com.hp.cmsz.entity.DimKpi; import com.hp.cmsz.entity.DimKpi;
public interface DimKpiDao extends JpaSpecificationExecutor<DimKpi>, public interface DimKpiDao extends JpaSpecificationExecutor<DimKpi>,
PagingAndSortingRepository<DimKpi, Long>{ PagingAndSortingRepository<DimKpi, Long>{
List<DimKpi> findAllByIsActiveAndBusnameId(String active,Long businessId);
//通过kpiTypeId查找数据采集频率 //通过kpiTypeId查找数据采集频率
@Query("select dk.calCycle from DimKpi dk where dk.kpiTypeId = ?1") @Query("select dk.calCycle from DimKpi dk where dk.kpiTypeId = :kpiTypeId")
List<String> findCayCycleByKpiTypeIdIn(@Param("kpiTypeId")Long kpiTypeId); List<String> findCayCycleByKpiTypeIdIn(@Param("kpiTypeId")Long kpiTypeId);
//通过kpiTypeId修改数据采集频率 //通过kpiTypeId修改数据采集频率
@Modifying @Modifying
@Query("update from DimKpi dk set dk.calCycle=:calCycle where dk.kpiTypeId=:kpiTypeId") @Query("update from DimKpi dk set dk.calCycle=:calCycle where dk.kpiTypeId=:kpiTypeId")
......
src/main/java/com/hp/cmsz/repository/ModelParameterDao.java
View file @ 25f2cdf0
...@@ -33,7 +33,12 @@ public interface ModelParameterDao extends JpaSpecificationExecutor<ModelParamet ...@@ -33,7 +33,12 @@ public interface ModelParameterDao extends JpaSpecificationExecutor<ModelParamet
//根据数据模型ID查找系统默认的参数d //根据数据模型ID查找系统默认的参数d
List<ModelParameter> findByDataModelIdAndIfSystemDefault(Long dataModelId, Long ifSystemDefault); List<ModelParameter> findByDataModelIdAndIfSystemDefault(Long dataModelId, Long ifSystemDefault);
//根据任务ID查找系统默认的参数d
List<ModelParameter> findByTaskIdAndIfSystemDefault(Long taskId, Long ifSystemDefault);
//根据数据模型ID查找参数d //根据数据模型ID查找参数d
List<ModelParameter> findByDataModelIdIn(List<Long> dataModelId); List<ModelParameter> findByDataModelIdIn(List<Long> dataModelId);
......
src/main/java/com/hp/cmsz/repository/commonmanage/APPEWarningDetailDao.java 0 → 100644
View file @ 25f2cdf0
package com.hp.cmsz.repository.commonmanage;
import com.hp.cmsz.entity.APPEWarningDetail;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface APPEWarningDetailDao extends PagingAndSortingRepository<APPEWarningDetail,
Long>, JpaSpecificationExecutor<APPEWarningDetail> {
APPEWarningDetail findByEwarningDetailId(Long id);
}
src/main/java/com/hp/cmsz/repository/commonmanage/EWarningCalcResultDao.java 0 → 100644
View file @ 25f2cdf0
package com.hp.cmsz.repository.commonmanage;
import com.hp.cmsz.entity.commonmanage.EWarningCalcResult;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface EWarningCalcResultDao extends PagingAndSortingRepository<EWarningCalcResult, Long>,
JpaSpecificationExecutor<EWarningCalcResult> {
List<EWarningCalcResult> findByEwarningDetailId(Long id);
}
src/main/java/com/hp/cmsz/service/analysissupport/DimKpiService.java
View file @ 25f2cdf0
package com.hp.cmsz.service.analysissupport; package com.hp.cmsz.service.analysissupport;
import com.hp.cmsz.entity.DimKpi;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.hp.cmsz.repository.DimKpiDao; import com.hp.cmsz.repository.DimKpiDao;
import java.util.List;
@Service @Service
@Transactional @Transactional
public class DimKpiService { public class DimKpiService {
...@@ -18,4 +21,9 @@ public class DimKpiService { ...@@ -18,4 +21,9 @@ public class DimKpiService {
private void updateByKpiTypeId(String calCycle,Long kpiTypeId){ private void updateByKpiTypeId(String calCycle,Long kpiTypeId){
dimKpiDao.updateDimKpiByKpiTypeId(calCycle, kpiTypeId); dimKpiDao.updateDimKpiByKpiTypeId(calCycle, kpiTypeId);
} }
//查出active为Y的所以KPI指标
public List<DimKpi> findAllByIsActiveAAndBusnameId(Long businessId){
return dimKpiDao.findAllByIsActiveAndBusnameId("Y",businessId);
}
} }
src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java
View file @ 25f2cdf0
package com.hp.cmsz.web.commonmanage; package com.hp.cmsz.web.commonmanage;
import java.io.UnsupportedEncodingException; import com.hp.cmsz.repository.commonmanage.EWarningCalcResultDao;
import java.util.List; import org.apache.commons.lang.StringUtils;
//import com.hp.cmsz.entity.APPEWarningDetail;
import com.hp.cmsz.entity.*;
import com.hp.cmsz.repository.*;
import com.hp.cmsz.service.PublicService;
import org.apache.commons.lang3.StringUtils;
import org.apache.regexp.RE;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -18,283 +11,392 @@ import org.springframework.web.bind.annotation.RequestParam; ...@@ -18,283 +11,392 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import com.hp.cmsz.entity.commonmanage.RunTask; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.util.Arrays;
import java.util.List;
import com.hp.cmsz.entity.commonmanage.RunTaskDetail; import com.hp.cmsz.entity.commonmanage.RunTaskDetail;
import com.hp.cmsz.entity.*;
import com.hp.cmsz.entity.commonmanage.RunTask;
import com.hp.cmsz.repository.*;
import com.hp.cmsz.repository.commonmanage.APPEWarningDetailDao;
import com.hp.cmsz.service.CmszOperationLogService; import com.hp.cmsz.service.CmszOperationLogService;
import com.hp.cmsz.service.analysissupport.DimKpiService;
import com.hp.cmsz.service.commonmanage.RunTaskService; import com.hp.cmsz.service.commonmanage.RunTaskService;
import com.hp.cmsz.service.commonmanage.TaskDetailService; import com.hp.cmsz.service.commonmanage.TaskDetailService;
import com.hp.cmsz.web.PageURLController; import com.hp.cmsz.web.PageURLController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@Controller @Controller
@RequestMapping(value = "/BaseManage/TaskManage/*") @RequestMapping(value = "/BaseManage/TaskManage/*")
public class TaskManageController { public class TaskManageController {
@Autowired @Autowired
private RunTaskService runTaskService; private RunTaskService runTaskService;
@Autowired @Autowired
private TaskDetailService taskDetailService; private TaskDetailService taskDetailService;
@Autowired @Autowired
private CmszOperationLogService cmszOperationLogService; private CmszOperationLogService cmszOperationLogService;
@Autowired @Autowired
private ModelParameterDao modelParameterDao; private ModelParameterDao modelParameterDao;
@Autowired @Autowired
private ChannelDao channelDao; private ChannelDao channelDao;
@Autowired @Autowired
private DataSourceDao dataSourceDao; private DataSourceDao dataSourceDao;
@Autowired @Autowired
private BusinessDao businessDao; private BusinessDao businessDao;
@Autowired @Autowired
private com.hp.cmsz.repository.PublicDao PublicDao; private com.hp.cmsz.repository.PublicDao PublicDao;
@Autowired
private DimKpiService dimKpiService;
@Autowired @Autowired
private ChannelDataSourceMapDao channelDataSourceMapDao; private ChannelDataSourceMapDao channelDataSourceMapDao;
@RequestMapping(value = "/taskHome") @Autowired
public ModelAndView taskHome(String selectTab) { private APPEWarningDetailDao aPPEWarningDetailDao;
ModelAndView modelAndView = new ModelAndView(PageURLController.TaskHome); @Autowired
modelAndView.addObject("selectTab", selectTab); private EWarningCalcResultDao eWarningCalcResultDao;
return modelAndView;
}
@RequestMapping(value = "/sandboxHome")
public ModelAndView sandboxHome(String selectTab) {
ModelAndView modelAndView = new ModelAndView(PageURLController.SandboxHome);
modelAndView.addObject("selectTab", selectTab);
return modelAndView;
}
@RequestMapping(value = "/modelMonitorHome")
public ModelAndView modelMonitorHome() {
ModelAndView modelAndView = new ModelAndView(PageURLController.ModelMonitorHome);
return modelAndView;
}
@RequestMapping(value = "/taskListFrame")
public ModelAndView taskListFrame(@RequestParam(value = "page", defaultValue = "taskId") String sortType,
@RequestParam(value = "page", defaultValue = "1") int pageNumber,
@RequestParam(value = "pageSize", defaultValue = "5") int pageSize, RunTask runTask, String newTaskStatus) {
ModelAndView modelAndView = new ModelAndView(PageURLController.RunTaskList);
/*if (StringUtils.isNotEmpty(newTaskStatus) && runTask.getTaskId() != null) {
runTaskService.updateTaskStatus(runTask.getTaskId(), newTaskStatus);
}
Page<RunTask> taskList = runTaskService.getRunTaskPage(runTask, pageNumber, pageSize, sortType);
modelAndView.addObject("taskList", taskList);*/ @RequestMapping(value = "/taskHome")
modelAndView.addObject("queryCondition", runTask); public ModelAndView taskHome(String selectTab) {
modelAndView.addObject("pageSize", pageSize); ModelAndView modelAndView = new ModelAndView(PageURLController.TaskHome);
modelAndView.addObject("sortType", sortType); modelAndView.addObject("selectTab", selectTab);
modelAndView.addObject("taskTypeList", runTaskService.getTaskTypeList()); return modelAndView;
}
return modelAndView;
}
@RequestMapping(value = "/queryResultFrame")
public ModelAndView queryResultFrame(@RequestParam(value = "page", defaultValue = "taskId") String sortType,
@RequestParam(value = "page", defaultValue = "1") int pageNumber,
@RequestParam(value = "pageSize", defaultValue = "5") int pageSize, RunTask runTask, String newTaskStatus) {
ModelAndView modelAndView = new ModelAndView(PageURLController.RunTaskListTable);
if (StringUtils.isNotEmpty(newTaskStatus) && runTask.getTaskId() != null) {
runTaskService.updateTaskStatus(runTask.getTaskId(), newTaskStatus);
}
Page<RunTask> taskList = runTaskService.getRunTaskPage(runTask, pageNumber, pageSize, sortType);
System.out.println(taskList.getSize()); @RequestMapping(value = "/sandboxHome")
modelAndView.addObject("taskList", taskList); public ModelAndView sandboxHome(String selectTab) {
//modelAndView.addObject("queryCondition", runTask); ModelAndView modelAndView = new ModelAndView(PageURLController.SandboxHome);
modelAndView.addObject("pageSize", pageSize); modelAndView.addObject("selectTab", selectTab);
modelAndView.addObject("sortType", sortType); return modelAndView;
modelAndView.addObject("taskTypeList", runTaskService.getTaskTypeList()); }
String tabName = "自定义任务";
if (new Long(1).equals(runTask.getDefaultTaskType())) {
tabName = "模型任务";
} else if (new Long(3).equals(runTask.getDefaultTaskType())) {
tabName = "沙盒任务";
}
cmszOperationLogService.createLog("查询", tabName, tabName + "页面的查询");
return modelAndView;
}
@RequestMapping(value = "/updateStatusFrame")
@ResponseBody
public String updateStatusFrame(String newTaskStatus, Long taskId, String defaultTaskType) {
String tabName = "自定义任务";
if ("1".equals(defaultTaskType)) {
tabName = "模型任务";
} else if ("3".equals(defaultTaskType)) {
tabName = "沙盒任务";
}
String action = "";
if ("1".equals(newTaskStatus)) {
action = "运行";
} else if ("2".equals(newTaskStatus)) {
action = "暂停";
}
cmszOperationLogService.createLog(action, tabName, "RUN_TASK_T.taskId=" + taskId);
runTaskService.updateTaskStatus(taskId, newTaskStatus);
return "success";
}
@RequestMapping(value = "/taskFormFrame")
public ModelAndView taskFormFrame(Long taskId, @RequestParam(required = false) String defaultTaskType) {
ModelAndView modelAndView = new ModelAndView(PageURLController.RunTaskForm);
RunTask runTask;
if (taskId != null) {
runTask = runTaskService.getRunTask(taskId);
} else {
runTask = new RunTask();
runTaskService.saveRunTask(runTask);//能够让模型参数根据任务id来进行关联，先把taskId传到前端
}
if (StringUtils.isNotEmpty(defaultTaskType)) {
runTask.setDefaultTaskType(new Long(defaultTaskType));
}
//模型列表 @RequestMapping(value = "/modelMonitorHome")
List<DataModel> dataModelList = runTaskService.getDataModelViewList(); public ModelAndView modelMonitorHome() {
//默认第一个模型的参数列表 ModelAndView modelAndView = new ModelAndView(PageURLController.ModelMonitorHome);
List<ModelParameter> modelParameterList = null; return modelAndView;
if(dataModelList.size()!=0){ }
modelParameterList = modelParameterDao.findByDataModelIdAndIfSystemDefault(dataModelList.get(0).getDataModelId(),0L);
}
//查询出所以省份信息
List<Province> provinceList = (List<Province>) PublicDao.findAll();
//查询出所有的渠道信息
List<Channel> channelList=(List<Channel>)channelDao.findChannel();
//查询出所有的数据来源信息
List<DataSource> datasourceList=(List<DataSource>)dataSourceDao.findDataSource();
//查询出所有的业务
List<Business> businessList= (List<Business>) businessDao.findAll();
List<ChannelDataSourceMap> channelDataSourceMapList = (List<ChannelDataSourceMap>) channelDataSourceMapDao.findAll();
modelAndView.addObject("runTask", runTask);
modelAndView.addObject("provinceList", provinceList);
modelAndView.addObject("channelList", channelList);
modelAndView.addObject("datasourceList", datasourceList);
modelAndView.addObject("businessList", businessList);
modelAndView.addObject("channelDataSourceMapList", channelDataSourceMapList);
//modelAndView.addObject("isModel", isModel);
modelAndView.addObject("taskGroupList", runTaskService.getTaskGroupList());
/*modelAndView.addObject("taskTypeList", runTaskService.getTaskTypeList());*/
modelAndView.addObject("sanboxList", taskDetailService.findTaskList(RunTaskDetail.TASK_TYPE_SANDBOX));
modelAndView.addObject("recoverList", taskDetailService.findTaskList(RunTaskDetail.TASK_TYPE_RECOVER));
modelAndView.addObject("dataModelList", dataModelList);
modelAndView.addObject("dataModelParameterList", modelParameterList);
modelAndView.addObject("taskTypeList", runTaskService.getTaskTypeList());
cmszOperationLogService.createLog("新增", "模型任务", "RUN_TASK_T.taskId=" + runTask.getTaskId());
return modelAndView;
}
@RequestMapping(value = "/submitTaskFrame", method = { RequestMethod.POST })
public String submitTaskFrame(RunTask runTask) {
if ("1".equals(runTask.getFrequencyType())) {
runTask.setFrequency(runTask.getFrequencyValue() + "/1440");
} else if ("2".equals(runTask.getFrequencyType())) {
runTask.setFrequency(runTask.getFrequencyValue() + "/24");
} else if ("3".equals(runTask.getFrequencyType())) {
runTask.setFrequency(runTask.getFrequencyValue());
} else if ("4".equals(runTask.getFrequencyType())) {
runTask.setFrequency("ADD_MONTHS(" + runTask.getFrequencyValue() + ")");
}
String action = "";
if (runTask.getTaskId() == null) {
action = "新增";
} else {
action = "修改";
}
//System.out.println(runTask.getFrequency());
runTaskService.saveRunTask(runTask);
String tabName = "自定义任务";
if (new Long(1).equals(runTask.getDefaultTaskType())) {
tabName = "模型任务";
} else if (new Long(3).equals(runTask.getDefaultTaskType())) {
tabName = "沙盒任务";
}
cmszOperationLogService.createLog(action, tabName, "RUN_TASK_T.taskId=" + runTask.getTaskId());
String url = "redirect:/BaseManage/TaskManage/taskListFrame";
if (runTask.getDefaultTaskType() != null) { @RequestMapping(value = "/taskListFrame")
url += "?defaultTaskType=" + runTask.getDefaultTaskType(); public ModelAndView taskListFrame(@RequestParam(value = "page",
} defaultValue = "taskId") String sortType,
return url; @RequestParam(value = "page", defaultValue = "1") int pageNumber,
} @RequestParam(value = "pageSize", defaultValue = "5") int pageSize,
RunTask runTask, String newTaskStatus) {
ModelAndView modelAndView = new ModelAndView(PageURLController.RunTaskList);
@RequestMapping(value = "/getModelParameterList") /*if (StringUtils.isNotEmpty(newTaskStatus) && runTask.getTaskId() != null) {
@ResponseBody runTaskService.updateTaskStatus(runTask.getTaskId(), newTaskStatus);
public List<ModelParameter> getModelParameterList(String modelId){
return modelParameterDao.findByDataModelIdAndIfSystemDefault(Long.parseLong(modelId),0L);
}
@RequestMapping(value = "/createModelParam*", method = RequestMethod.GET)
@ResponseBody
public void createModelParam(
@RequestParam(value="paramName") String paramName,
@RequestParam(value="paramValue") String paramValue,
@RequestParam(value="paramType") String paramType,
@RequestParam(value="taskId") String taskId,
@RequestParam(value="modelId") String modelId,
HttpServletResponse response, HttpServletRequest request) {
ModelParameter modelParameter = new ModelParameter();
if(!paramName.trim().equals("")){modelParameter.setParameterName(paramName);}
if(!paramValue.trim().equals("")){modelParameter.setParameterValue(paramValue);}
if(!paramType.trim().equals("")){modelParameter.setParameterDataType(paramType);}
if(!taskId.trim().equals("")){modelParameter.setTaskId(Long.parseLong(taskId));}
if(!modelId.trim().equals("")){modelParameter.setDataModelId(Long.parseLong(modelId));}
modelParameter.setIfSystemDefault(1L);
modelParameterDao.save(modelParameter);
}
@RequestMapping(value = "/taskDeleteFrame")
public String taskDeleteFrame(Long taskId, @RequestParam(required = false) String defaultTaskType) {
runTaskService.deleteRunTask(taskId);
String tabName = "自定义任务";
if ("1".equals(defaultTaskType)) {
tabName = "模型任务";
} else if ("3".equals(defaultTaskType)) {
tabName = "沙盒任务";
}
cmszOperationLogService.createLog("删除", tabName, "RUN_TASK_T.taskId=" + taskId);
String url = "redirect:/BaseManage/TaskManage/taskListFrame";
if (StringUtils.isNotEmpty(defaultTaskType)) {
url += "?defaultTaskType=" + new Long(defaultTaskType);
} }
return url; Page<RunTask> taskList = runTaskService.getRunTaskPage(runTask, pageNumber, pageSize, sortType);
}
@RequestMapping(value = "/checkNameAndCode")
@ResponseBody
public String checkNameAndCode(String name, String code, String id,
@RequestParam(required = false) String defaultTaskType) throws UnsupportedEncodingException {
return runTaskService.checkNameAndCode(java.net.URLDecoder.decode(name, "UTF-8"), code, id, defaultTaskType);
}
// public APPEWarningDetail ModelPreview(String id){
//
//
// return null;
// };
modelAndView.addObject("taskList", taskList);*/
modelAndView.addObject("queryCondition", runTask);
modelAndView.addObject("pageSize", pageSize);
modelAndView.addObject("sortType", sortType);
modelAndView.addObject("taskTypeList", runTaskService.getTaskTypeList());
// modelAndView.addObject("useType", defaultTaskType);
return modelAndView;
}
@RequestMapping(value = "/queryResultFrame")
public ModelAndView queryResultFrame(@RequestParam(value = "page", defaultValue = "taskId") String sortType,
@RequestParam(value = "page", defaultValue = "1") int pageNumber,
@RequestParam(value = "pageSize", defaultValue = "5") int pageSize, RunTask runTask, String newTaskStatus) {
ModelAndView modelAndView = new ModelAndView(PageURLController.RunTaskListTable);
if (StringUtils.isNotEmpty(newTaskStatus) && runTask.getTaskId() != null) {
runTaskService.updateTaskStatus(runTask.getTaskId(), newTaskStatus);
}
Page<RunTask> taskList = runTaskService.getRunTaskPage(runTask, pageNumber, pageSize, sortType);
System.out.println(taskList.getSize());
modelAndView.addObject("taskList", taskList);
//modelAndView.addObject("queryCondition", runTask);
modelAndView.addObject("pageSize", pageSize);
modelAndView.addObject("sortType", sortType);
modelAndView.addObject("taskTypeList", runTaskService.getTaskTypeList());
String tabName = "自定义任务";
if (new Long(1).equals(runTask.getDefaultTaskType())) {
tabName = "模型任务";
} else if (new Long(3).equals(runTask.getDefaultTaskType())) {
tabName = "沙盒任务";
}
cmszOperationLogService.createLog("查询", tabName, tabName + "页面的查询");
return modelAndView;
}
@RequestMapping(value = "/updateStatusFrame")
@ResponseBody
public String updateStatusFrame(String newTaskStatus, Long taskId, String defaultTaskType) {
String tabName = "自定义任务";
if ("1".equals(defaultTaskType)) {
tabName = "模型任务";
} else if ("3".equals(defaultTaskType)) {
tabName = "沙盒任务";
}
String action = "";
if ("1".equals(newTaskStatus)) {
action = "运行";
} else if ("2".equals(newTaskStatus)) {
action = "暂停";
}
cmszOperationLogService.createLog(action, tabName, "RUN_TASK_T.taskId=" + taskId);
runTaskService.updateTaskStatus(taskId, newTaskStatus);
return "success";
}
@RequestMapping(value = "/taskFormFrame")
public ModelAndView taskFormFrame(Long taskId, @RequestParam(required = false) String defaultTaskType,String type) {
ModelAndView modelAndView = new ModelAndView(PageURLController.RunTaskForm);
RunTask runTask;
List<ModelParameter> modelParameterList = null;
if (taskId != null) {
runTask = runTaskService.getRunTask(taskId);
} else {
runTask = new RunTask();
runTaskService.saveRunTask(runTask);//能够让模型参数根据任务id来进行关联，先把taskId传到前端
}
if (StringUtils.isNotEmpty(defaultTaskType)) {
runTask.setDefaultTaskType(new Long(defaultTaskType));
}
//模型列表
List<DataModel> dataModelList = runTaskService.getDataModelViewList();
//默认第一个模型的参数列表
if(dataModelList.size()!=0){
if(type.equals("new")){
modelParameterList = modelParameterDao.findByDataModelIdAndIfSystemDefault(dataModelList.get(0).getDataModelId(),0L);
}else{
modelParameterList = modelParameterDao.findByTaskIdAndIfSystemDefault(runTask.getTaskId(),1L);
}
}
//查询出所以省份信息
List<Province> provinceList = (List<Province>) PublicDao.findAll();
//查询出所有的渠道信息
List<Channel> channelList=(List<Channel>)channelDao.findChannel();
//查询出所有的数据来源信息
List<DataSource> datasourceList=(List<DataSource>)dataSourceDao.findDataSource();
//查询出所有的业务
List<Business> businessList= (List<Business>) businessDao.findAll();
List<ChannelDataSourceMap> channelDataSourceMapList = (List<ChannelDataSourceMap>) channelDataSourceMapDao.findAll();
modelAndView.addObject("runTask", runTask);
modelAndView.addObject("provinceList", provinceList);
modelAndView.addObject("channelList", channelList);
modelAndView.addObject("datasourceList", datasourceList);
modelAndView.addObject("businessList", businessList);
modelAndView.addObject("channelDataSourceMapList", channelDataSourceMapList);
modelAndView.addObject("taskGroupList", runTaskService.getTaskGroupList());
modelAndView.addObject("sanboxList", taskDetailService.findTaskList(RunTaskDetail.TASK_TYPE_SANDBOX));
modelAndView.addObject("recoverList", taskDetailService.findTaskList(RunTaskDetail.TASK_TYPE_RECOVER));
modelAndView.addObject("dataModelList", dataModelList);
modelAndView.addObject("dataModelParameterList", modelParameterList);
modelAndView.addObject("taskTypeList", runTaskService.getTaskTypeList());
modelAndView.addObject("useType", type);
cmszOperationLogService.createLog("新增", "模型任务", "RUN_TASK_T.taskId=" + runTask.getTaskId());
return modelAndView;
}
//根据业务查出指标
@RequestMapping("/findKpiByBusiness")
@ResponseBody
public List<DimKpi> findKpiByBusiness(String businessId){
return dimKpiService.findAllByIsActiveAAndBusnameId(Long.parseLong(businessId));
}
@RequestMapping(value = "/submitTaskFrame", method = { RequestMethod.POST })
public String submitTaskFrame(RunTask runTask) {
if ("1".equals(runTask.getFrequencyType())) {
runTask.setFrequency(runTask.getFrequencyValue() + "/1440");
} else if ("2".equals(runTask.getFrequencyType())) {
runTask.setFrequency(runTask.getFrequencyValue() + "/24");
} else if ("3".equals(runTask.getFrequencyType())) {
runTask.setFrequency(runTask.getFrequencyValue());
} else if ("4".equals(runTask.getFrequencyType())) {
runTask.setFrequency("ADD_MONTHS(" + runTask.getFrequencyValue() + ")");
}
String action = "";
if (runTask.getTaskId() == null) {
action = "新增";
} else {
action = "修改";
}
//System.out.println(runTask.getFrequency());
runTaskService.saveRunTask(runTask);
String tabName = "自定义任务";
if (new Long(1).equals(runTask.getDefaultTaskType())) {
tabName = "模型任务";
} else if (new Long(3).equals(runTask.getDefaultTaskType())) {
tabName = "沙盒任务";
}
cmszOperationLogService.createLog(action, tabName, "RUN_TASK_T.taskId=" + runTask.getTaskId());
String url = "redirect:/BaseManage/TaskManage/taskListFrame";
if (runTask.getDefaultTaskType() != null) {
url += "?defaultTaskType=" + runTask.getDefaultTaskType();
}
return url;
}
@RequestMapping(value = "/getModelParameterList")
@ResponseBody
public List<ModelParameter> getModelParameterList(String modelId){
return modelParameterDao.findByDataModelIdAndIfSystemDefault(Long.parseLong(modelId),0L);
}
@RequestMapping(value = "/createModelParam*", method = RequestMethod.GET)
@ResponseBody
public void createModelParam(
@RequestParam(value="paramName") String paramName,
@RequestParam(value="paramId") String paramId,
@RequestParam(value="useType") String useType,
@RequestParam(value="paramValue") String paramValue,
@RequestParam(value="paramType") String paramType,
@RequestParam(value="taskId") String taskId,
@RequestParam(value="modelId") String modelId,
HttpServletResponse response, HttpServletRequest request) {
ModelParameter modelParameter=null;
if(useType.equals("new")){
modelParameter = new ModelParameter();
}else{
modelParameter = modelParameterDao.findOne(Long.parseLong(paramId));
}
if(!paramName.trim().equals("")){modelParameter.setParameterName(paramName);}
if(!paramValue.trim().equals("")){modelParameter.setParameterValue(paramValue);}
if(!paramType.trim().equals("")){modelParameter.setParameterDataType(paramType);}
if(!taskId.trim().equals("")){modelParameter.setTaskId(Long.parseLong(taskId));}
if(!modelId.trim().equals("")){modelParameter.setDataModelId(Long.parseLong(modelId));}
modelParameter.setIfSystemDefault(1L);
modelParameterDao.save(modelParameter);
}
@RequestMapping(value = "/taskDeleteFrame")
public String taskDeleteFrame(Long taskId, @RequestParam(required = false) String defaultTaskType) {
runTaskService.deleteRunTask(taskId);
String tabName = "自定义任务";
if ("1".equals(defaultTaskType)) {
tabName = "模型任务";
} else if ("3".equals(defaultTaskType)) {
tabName = "沙盒任务";
}
cmszOperationLogService.createLog("删除", tabName, "RUN_TASK_T.taskId=" + taskId);
String url = "redirect:/BaseManage/TaskManage/taskListFrame";
if (StringUtils.isNotEmpty(defaultTaskType)) {
url += "?defaultTaskType=" + new Long(defaultTaskType);
}
return url;
}
@RequestMapping(value = "/checkNameAndCode")
@ResponseBody
public String checkNameAndCode(String name, String code, String id,
@RequestParam(required = false) String defaultTaskType) throws UnsupportedEncodingException {
return runTaskService.checkNameAndCode(java.net.URLDecoder.decode(name, "UTF-8"), code, id, defaultTaskType);
}
@RequestMapping(value = "/modelPreview")
@ResponseBody
public APPEWarningDetail ModelPreview(String id){
APPEWarningDetail app =null;
RunTask rt = runTaskService.getRunTask(Long.parseLong(id));
String path = "/home/dsadm/ETL/test/"+rt.getDataModelView().getModelScriptName()+" "+id;
// String path ="d:\\rscript\\a.r";
try {
Runtime run = Runtime.getRuntime();// 返回与当前 Java 应用程序相关的运行时对象
try {
String cmds = "Rscript "+path; // 注意：对字符串中路径\进行转义
Process p = run.exec(cmds);// 启动另一个进程来执行命令
InputStream is = p.getInputStream();
BufferedReader reader = new BufferedReader(new InputStreamReader(is));
String line = null;
//[1] "13500001"
StringBuffer context = new StringBuffer();
while ((line = reader.readLine()) != null){
System.out.println(line);
context.append(line);
}
System.out.println("context:"+context);
int i = context.indexOf("EWARNING_DETAIL_ID:");
String k = context.substring(i+19,context.length()-1);
p.waitFor();
is.close();
reader.close();
p.destroy();
app = aPPEWarningDetailDao.findByEwarningDetailId(Long.parseLong(k));
app.seteWarningCalcResult(eWarningCalcResultDao.findByEwarningDetailId(app.getEwarningDetailId()));
} catch (Exception e) {
e.printStackTrace();
}
}catch (Exception e){
System.out.println("错误："+e.toString());
}
return app;
};
@RequestMapping(value = "/modelPreviewImg")
public void ModelPreview(HttpServletResponse response,String path){
System.out.println("fileName:"+path);
File file = new File("/home/dsadm/ETL/test/"+path);
// File file = new File("d:\\rscript\\al.jpg");
FileInputStream fis;
try {
fis = new FileInputStream(file);
long size = file.length();
byte[] temp = new byte[(int) size];
fis.read(temp, 0, (int) size);
fis.close();
byte[] data = temp;
response.setContentType("image/jpg");
OutputStream out = response.getOutputStream();
out.write(data);
out.flush();
out.close();
} catch (Exception e) {
e.printStackTrace();
}
}
} }
\ No newline at end of file
src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp
View file @ 25f2cdf0
...@@ -74,37 +74,66 @@ ...@@ -74,37 +74,66 @@
</div> </div>
</div> </div>
<script type=""> <script type="">
function OpenDialog(data) {
// var data = JSON.parse(data); var dilog;
function editTask(e){
// var id = $('input[name="taskId"]:checked').val();
var id = e.id.split("_")[1];
var taskType=e.id.split("_")[0];
dilog.close();
document.getElementById("taskManageFrame").src='${ctx}'+"/BaseManage/TaskManage/taskFormFrame?defaultTaskType="+taskType+"&taskId=" + id+"&type=modify";
}
function OpenDialog(data,id,taskType) {
var df=new SimpleDateFormat();
df.applyPattern("yyyy-MM-dd HH:mm:ss");
var content ="<div class='dialog-p' style='max-height: 560px; overflow-y: scroll; overflow-x: auto;'>" + var content ="<div class='dialog-p' style='max-height: 560px; overflow-y: scroll; overflow-x: auto;'>" +
" <div class='col-xs-12'>" + " <div class='col-xs-12'>" +
" <div class='panel panel-default'>" + " <div class='panel panel-default'>" +
" <div class='panel-heading'>模型预览<input onclick='createWorkingDetail()' id='createWorkingDetail' style='float:right' type='button' class='btn btn-primary' value='参数修改'></div>" + " <div class='panel-heading'>模型预览<input onclick='editTask(this)' id='"+taskType+"_"+id+"' style='float:right' type='button' class='btn btn-primary' value='参数修改'></div>" +
" <div class='panel-body'>"+ " <div class='panel-body'>"+
" <table class='table table-vertical'>"+ " <table class='table table-vertical'>"+
" <tr><td>"+ " <tr><td>"+
" <table class='table table-vertical'>" + " <table class='table table-vertical'>" +
" <tr>" + " <tr>" +
" <td width='10%'>省份</td>" + " <td width='10%'>省份</td>" +
" <td>自定义</td>" + " <td>"+data.provinceName+"</td>" +
" <td width='10%'>数据来源</td>" + " <td width='10%'>数据来源</td>" +
" <td>自定义</td>" + " <td>"+data.datasourceName+"</td>" +
" <td width='10%'>业务</td>" + " <td width='10%'>业务</td>" +
" <td>自定义</td>" + " <td>"+data.busname+"</td>" +
" <td width='10%'>渠道</td>" +
" <td>自定义</td>" +
" </tr>" + " </tr>" +
" <tr>" + " <tr>" +
" <td width='10%'>渠道</td>" +
" <td>"+data.channelName+"</td>" +
" <td>指标编码</td>" + " <td>指标编码</td>" +
" <td>自定义</td>" + " <td>"+data.kpiCode+"</td>" +
" <td>指标名称</td>" + " <td>指标名称</td>" +
" <td>自定义</td>" + " <td>"+data.kpiName+"</td>" +
" </tr>" +
" <tr>" +
" <td>预测开始时间</td>" + " <td>预测开始时间</td>" +
" <td>自定义</td>" + " <td>"+df.format(new Date(data.busdatabegTime))+"</td>" +
" <td>预测结束时间</td>" + " <td>预测结束时间</td>" +
" <td>自定义</td>" + " <td>"+df.format(new Date(data.busdataendTime))+"</td>" +
" <td>阈值1</td>" +
" <td>"+removeNull(data.threshold1Val)+"</td>" +
" </tr>" +
" <tr>" +
" <td>阈值2</td>" +
" <td>"+removeNull(data.threshold2Val)+"</td>" +
" <td>阈值3</td>" +
" <td>"+removeNull(data.threshold3Val)+"</td>" +
" <td>阈值告警1</td>" +
" <td>"+removeNull(data.warn1Val)+"</td>" +
" </tr>" +
" <tr>" +
" <td>阈值告警2</td>" +
" <td>"+removeNull(data.warn2Val)+"</td>" +
" <td>阈值告警3</td>" +
" <td>"+removeNull(data.warn3Val)+"</td>" +
" </tr>" + " </tr>" +
" <tr>" + " <tr>" +
" <td colspan='8' align='center'>图表展示</td>" + " <td colspan='8' align='center'>图表展示</td>" +
...@@ -112,20 +141,46 @@ ...@@ -112,20 +141,46 @@
" <tr>" + " <tr>" +
" <td colspan='8'>" + " <td colspan='8'>" +
" <div class=''>" + " <div class=''>" +
<%--" <iframe id='ewarningIf' style='height:560px;padding: 7px;' scrolling='no' src='${biserver_config}&path=MonitorOperation/WarnAnalysis&action=GJFX_DETAIL_RELATED_EWARN.xaction&wrapper=false&height=534&WarningID="+getCol(t1, 'warningId')+ "&WarningSourceTag="+getCol(t1, 'warningSourceId')+ "&ctx=${ctx}" +"'></iframe>" +--%> " <img src='${ctx}/BaseManage/TaskManage/modelPreviewImg?path="+data.fileAddress+"'/>" +
" </div>" +
" </td>" +
" </tr>" +
" <tr>" +
" <td colspan='8' align='center'>模型数据明细展示</td>" +
" </tr>" +
" <tr>" +
" <td colspan='8'>" +
" <div class='panel-body'>" +
" <table class='table '>" +
" <thead>" +
" <tr><th colspan='2'>时间</th><th colspan='2'>真实值</th><th colspan='2'>预测值</th></tr>" +
" </thead>" +
" <tbody>" ;
data.eWarningCalcResult = data.eWarningCalcResult.sort(function (a,b) {
return a.resultDate-b.resultDate
});
data.eWarningCalcResult.forEach(function (t) {
content = content+"<tr><td colspan='2'>"+df.format(new Date(t.resultDate))+"<td><td colspan='2'>"+t.dim1Val+"</td><td colspan='2'>"+t.dim2Val+"</td></tr>"
});
content = content+
" </tbody>" +
" </table>"+
" </div>" + " </div>" +
" </td>" + " </td>" +
" </tr>" + " </tr>" +
"</table>"; "</table>";
$.dialog({ dilog= $.dialog({
title:'模型预览结果', title:'模型预览结果',
content:content, content:content,
lock: true lock: true
}); });
} }
function preview() { function removeNull(val) {
OpenDialog(); return val==null?"":val
} }
</script> </script>
</body> </body>
......
src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp
View file @ 25f2cdf0
...@@ -38,6 +38,7 @@ var provinceOptions = new Array(); ...@@ -38,6 +38,7 @@ var provinceOptions = new Array();
var datasourceOptions = new Array(); var datasourceOptions = new Array();
var channelOptions = new Array(); var channelOptions = new Array();
var businessOptions = new Array(); var businessOptions = new Array();
var kpiOptions = new Array();
$(document).ready(function() { $(document).ready(function() {
changeInputStatus('parallelFlg', 'parallelNums'); changeInputStatus('parallelFlg', 'parallelNums');
...@@ -60,7 +61,6 @@ var businessOptions = new Array(); ...@@ -60,7 +61,6 @@ var businessOptions = new Array();
</c:forEach> </c:forEach>
$('#modelId').append(dataModelOptions); $('#modelId').append(dataModelOptions);
<c:forEach items="${provinceList}" var="province"> <c:forEach items="${provinceList}" var="province">
var option = new Option('${province.provinceName}','${province.provinceId}'); var option = new Option('${province.provinceName}','${province.provinceId}');
provinceOptions.push(option); provinceOptions.push(option);
...@@ -76,12 +76,12 @@ var businessOptions = new Array(); ...@@ -76,12 +76,12 @@ var businessOptions = new Array();
var channelName = ""; var channelName = "";
<c:forEach items="${channelList}" var="channel" varStatus="channelStatus"> <c:forEach items="${channelList}" var="channel" varStatus="channelStatus">
<c:if test="${channel.channelId == channelDataSourceMap.channelId}" > <c:if test="${channel.channelId == channelDataSourceMap.channelId}" >
channelName='${channel.channelName}'; var channelOption = new Option('${channel.channelName}','${channel.channelId}');
channelOptions.push(channelOption);
</c:if> </c:if>
</c:forEach> </c:forEach>
var channelOption = new Option(channelName,'${channelDataSourceMap.channelId}');
channelOptions.push(channelOption);
</c:if> </c:if>
</c:forEach> </c:forEach>
</c:if> </c:if>
...@@ -95,10 +95,9 @@ var businessOptions = new Array(); ...@@ -95,10 +95,9 @@ var businessOptions = new Array();
<c:forEach items="${channelDataSourceMapList}" var="channelDataSourceMap"> <c:forEach items="${channelDataSourceMapList}" var="channelDataSourceMap">
if('${channelDataSourceMap.channelId}' == $("#channelId").val() && '${channelDataSourceMap.dataSourceId}' == $("#datasourceViewId").val()){ if('${channelDataSourceMap.channelId}' == $("#channelId").val() && '${channelDataSourceMap.dataSourceId}' == $("#datasourceViewId").val()){
<c:forEach items="${businessList}" var="business"> <c:forEach items="${businessList}" var="business">
<c:if test="${business.channelDataSourceMapId == channelDataSourceMap.channelDataSourceMapId}"> <c:if test="${business.channelDataSourceMapId == channelDataSourceMap.channelDataSourceMapId && business.isActive =='Y' }">
var option = new Option('${business.businessName}','${business.businessId}'); var option = new Option('${business.businessName}','${business.businessId}');
businessOptions.push(option); businessOptions.push(option);
</c:if> </c:if>
</c:forEach> </c:forEach>
} }
...@@ -107,13 +106,31 @@ var businessOptions = new Array(); ...@@ -107,13 +106,31 @@ var businessOptions = new Array();
$('#businessId').append(businessOptions); $('#businessId').append(businessOptions);
} }
changeBusinessData(); changeBusinessData();
function changeKPIData(){
var businessId = $("#businessId").val();
$.ajax({
type : 'GET',
contentType : 'application/json',
url: "${ctx}/BaseManage/TaskManage/findKpiByBusiness?businessId="+businessId,
dataType : 'text',
beforeSend: function(data) {},
success: function(data) {
$('#KPIViewId').empty();
data = JSON.parse(data);
data.forEach(function(t){
var option = new Option(t.name,t.kpiId);
$('#KPIViewId').append(option);
})
}
});
}
changeKPIData();
<c:forEach items="${dataModelParameterList}" var="dataModelParameter"> <c:forEach items="${dataModelParameterList}" var="dataModelParameter">
var tr = "<tr><td>${dataModelParameter.parameterName}</td><td><input type='text' class='parameterValue' name='parameterValue' value='${dataModelParameter.parameterValue}'/></td><td>${dataModelParameter.parameterDataType}</td></tr>"; var tr = "<tr id='${dataModelParameter.parameterId}'><td>${dataModelParameter.parameterName}</td><td><input type='text' class='parameterValue' name='parameterValue' value='${dataModelParameter.parameterValue}'/></td><td>${dataModelParameter.parameterDataType}</td></tr>";
$('#addTr').append(tr); $('#addTr').append(tr);
</c:forEach> </c:forEach>
changeTaskType(); changeTaskType();
$('#modelId').val('${runTask.dataModelView.dataModelId}'); $('#modelId').val('${runTask.dataModelView.dataModelId}');
$('#detailSelect').val('${runTask.taskDetail.taskInfoId}'); $('#detailSelect').val('${runTask.taskDetail.taskInfoId}');
...@@ -154,7 +171,7 @@ var businessOptions = new Array(); ...@@ -154,7 +171,7 @@ var businessOptions = new Array();
$('#addTr').empty(); $('#addTr').empty();
data = JSON.parse(data) data = JSON.parse(data)
data.forEach(function(t){ data.forEach(function(t){
var tr = "<tr><td>"+t.parameterName+"</td><td><input type='text' id='parameterValue' value='"+t.parameterValue+"'/></td><td>"+t.parameterDataType+"</td></tr>"; var tr = "<tr id='"+t.parameterId+"'><td>"+t.parameterName+"</td><td><input type='text' class='parameterValue' value='"+t.parameterValue+"'/></td><td>"+t.parameterDataType+"</td></tr>";
$('#addTr').append(tr); $('#addTr').append(tr);
}) })
} }
...@@ -167,24 +184,27 @@ var businessOptions = new Array(); ...@@ -167,24 +184,27 @@ var businessOptions = new Array();
<c:forEach items="${channelDataSourceMapList}" var="channelDataSourceMap" > <c:forEach items="${channelDataSourceMapList}" var="channelDataSourceMap" >
if('${channelDataSourceMap.dataSourceId}'==$("#datasourceViewId").val()){ if('${channelDataSourceMap.dataSourceId}'==$("#datasourceViewId").val()){
var channelName = ""; var channelName = "";
<c:forEach items="${channelList}" var="channel" varStatus="channelStatus"> <c:forEach items="${channelList}" var="channel" >
<c:if test="${channel.channelId == channelDataSourceMap.channelId}" > <c:if test="${channel.channelId == channelDataSourceMap.channelId}" >
channelName='${channel.channelName}'; var channelOption = new Option('${channel.channelName}','${channel.channelId}');
</c:if> channelOptions.push(channelOption);
</c:if>
</c:forEach> </c:forEach>
var channelOption = new Option(channelName,'${channelDataSourceMap.channelId}');
channelOptions.push(channelOption);
} }
</c:forEach> </c:forEach>
$('#channelId').append(channelOptions); $('#channelId').append(channelOptions);
changeBusinessData(); changeBusinessData();
changeKPIData()
}); });
$('#channelId').change(function(){ $('#channelId').change(function(){
changeBusinessData(); changeBusinessData();
changeKPIData()
}) })
$('#businessId').change(function(){
changeKPIData()
})
}); });
...@@ -209,16 +229,17 @@ var businessOptions = new Array(); ...@@ -209,16 +229,17 @@ var businessOptions = new Array();
}else { }else {
$("#addTr").find("tr").each(function () { $("#addTr").find("tr").each(function () {
//alert($(this).find("td").eq(0).html()); //alert($(this).find("td").eq(0).html());
var paramId = $(this).context.id;
var modelId = $('#modelId').val(); var modelId = $('#modelId').val();
var paramName = $(this).find("td").eq(0).html(); var paramName = $(this).find("td").eq(0).html();
var paramValue = $(this).find("td").eq(1).find("input").val(); var paramValue = $(this).find("td").eq(1).find("input").val();
var paramType = $(this).find("td").eq(2).html(); var paramType = $(this).find("td").eq(2).html();
var taskId = $('#taskId').val(); var taskId = $('#taskId').val();
console.log(paramValue)
$.ajax({ $.ajax({
type: "GET", type: "GET",
contentType: "application/json", contentType: "application/json",
url: "${ctx}/BaseManage/TaskManage/createModelParam?modelId="+encodeURIComponent(modelId)+"&paramName=" + encodeURIComponent(paramName) + "&paramValue=" + encodeURIComponent(paramValue) + "&paramType=" + encodeURIComponent(paramType) + "&taskId=" + encodeURIComponent(taskId), url: "${ctx}/BaseManage/TaskManage/createModelParam?useType="+$("#useType").val()+"&paramId="+paramId+"&modelId="+encodeURIComponent(modelId)+"&paramName=" + encodeURIComponent(paramName) + "&paramValue=" + encodeURIComponent(paramValue) + "&paramType=" + paramType + "&taskId=" + taskId,
dataType: "text", dataType: "text",
async: false, async: false,
beforeSend: function (data) { beforeSend: function (data) {
...@@ -399,6 +420,7 @@ var businessOptions = new Array(); ...@@ -399,6 +420,7 @@ var businessOptions = new Array();
<form id="detailForm" class="form-horizontal" role="form" <form id="detailForm" class="form-horizontal" role="form"
action="${ctx}/BaseManage/TaskManage/submitTaskFrame" method="post"> action="${ctx}/BaseManage/TaskManage/submitTaskFrame" method="post">
<input type="hidden" id="taskId" name="taskId" value="${runTask.taskId}"> <input type="hidden" id="taskId" name="taskId" value="${runTask.taskId}">
<input type="hidden" id="useType" value="${useType}">
<input type="hidden" id="defaultTaskType" name="defaultTaskType" value="${runTask.defaultTaskType}"> <input type="hidden" id="defaultTaskType" name="defaultTaskType" value="${runTask.defaultTaskType}">
<c:if test="${empty runTask.taskId}"> <c:if test="${empty runTask.taskId}">
<input type="hidden" name="taskStatus" value="1"> <input type="hidden" name="taskStatus" value="1">
...@@ -418,39 +440,47 @@ var businessOptions = new Array(); ...@@ -418,39 +440,47 @@ var businessOptions = new Array();
<td>任务代码（<font color="red">必填</font>）：</td> <td>任务代码（<font color="red">必填</font>）：</td>
<td><input type="input" class="form-control input-sm" id="code" name="code" value="${runTask.code}"></td> <td><input type="input" class="form-control input-sm" id="code" name="code" value="${runTask.code}"></td>
</tr> </tr>
<c:if test="${runTask.defaultTaskType == 1 || runTask.defaultTaskType == 5 }">
<tr>
<td id="provinceLabel">省份：</td>
<td id="provinceDiv">
<select class="form-control input-sm" id="provinceId" name="provinceView.provinceId">
</select>
</td>
</tr>
<tr> <tr>
<td id="provinceLabel">省份：</td> <td id="dataSourceLabel">数据来源：</td>
<td id="provinceDiv"> <td id="dataSourceDiv">
<select class="form-control input-sm" id="provinceId" name="provinceView.provinceId"> <select class="form-control input-sm" id="datasourceViewId" name="dataSourceView.dataSourceId" >
</select> </select>
</td> </td>
</tr> </tr>
<tr>
<td id="dataSourceLabel">数据来源：</td>
<td id="dataSourceDiv">
<select class="form-control input-sm" id="datasourceViewId" name="dataSource.dataSourceId" >
</select>
</td>
</tr>
<tr> <tr>
<td id="channelLabel">渠道：</td> <td id="channelLabel">渠道：</td>
<td id="channelDiv"> <td id="channelDiv">
<select class="form-control input-sm" id="channelId" > <select class="form-control input-sm" id="channelId" name="channelView.channelId" >
</select> </select>
</td> </td>
</tr> </tr>
<tr> <tr>
<td id="businessLabel">业务：</td> <td id="businessLabel">业务：</td>
<td id="businessDiv"> <td id="businessDiv">
<select class="form-control input-sm" id="businessId" > <select class="form-control input-sm" id="businessId" name="businessView.businessId" >
</select> </select>
</td> </td>
</tr> </tr>
<tr>
<td id="KPILabel">指标：</td>
<td id="KPIDiv">
<select class="form-control input-sm" id="KPIViewId" name="dimKpiView.kpiId" >
</select>
</td>
</tr>
</c:if >
<tr> <tr>
<td>任务组：</td> <td>任务组：</td>
<td> <td>
...@@ -541,37 +571,55 @@ var businessOptions = new Array(); ...@@ -541,37 +571,55 @@ var businessOptions = new Array();
</td> </td>
</tr> </tr>
<c:if test="${runTask.defaultTaskType != 3 }"> <c:if test="${runTask.defaultTaskType != 3 }">
<tr id="frequencyRow"> <tr id="frequencyRow">
<td valign="top">运行频率：</td> <td valign="top">运行频率：</td>
<td> <td>
<%-- <input type="input" class="form-control input-sm " id="frequency" name="frequency" value="${runTask.frequency}" maxlength="100"> --%> <%-- <input type="input" class="form-control input-sm " id="frequency" name="frequency" value="${runTask.frequency}" maxlength="100"> --%>
<select class="form-control input-sm" id="frequencyType" name="frequencyType" onchange="changeFrequencyType()"> <select class="form-control input-sm" id="frequencyType" name="frequencyType" onchange="changeFrequencyType()">
<option value="1" <c:if test="${runTask.frequencyType == '1' }">selected</c:if> >分钟</option> <option value="1" <c:if test="${runTask.frequencyType == '1' }">selected</c:if> >分钟</option>
<option value="2" <c:if test="${runTask.frequencyType == '2' }">selected</c:if> >小时</option> <option value="2" <c:if test="${runTask.frequencyType == '2' }">selected</c:if> >小时</option>
<option value="3" <c:if test="${runTask.frequencyType == '3' }">selected</c:if> >日</option> <option value="3" <c:if test="${runTask.frequencyType == '3' }">selected</c:if> >日</option>
<option value="4" <c:if test="${runTask.frequencyType == '4' }">selected</c:if> >月</option> <option value="4" <c:if test="${runTask.frequencyType == '4' }">selected</c:if> >月</option>
</select> </select>
<select class="form-control input-sm" id="frequencyValue" name="frequencyValue"> <select class="form-control input-sm" id="frequencyValue" name="frequencyValue">
</select> </select>
<input type="hidden" id="frequencyValueHidden" value="${runTask.frequencyValue }"> <input type="hidden" id="frequencyValueHidden" value="${runTask.frequencyValue }">
</td> </td>
</tr> </tr>
</c:if> </c:if>
<tr> <c:if test="${runTask.defaultTaskType == 1 || runTask.defaultTaskType == 5}">
<td>模型参数：</td> <tr>
<td> <td>模型参数：</td>
<div style="width:420px;height: 130px;overflow: auto"> <td>
<table class="table table-hover table-striped" id="displayParam" > <div style="width:420px;height: 130px;overflow: auto">
<thead> <table class="table table-hover table-striped" id="displayParam" >
<tr><th>参数名</th><th>参数值</th><th>参数类型</th></tr> <thead>
</thead> <tr><th>参数名</th><th>参数值</th><th>参数类型</th></tr>
<tbody id="addTr"> </thead>
<tbody id="addTr">
</tbody>
</table>
</div>
</td>
</tr>
</c:if>
<tr>
<td>任务内容：</td>
<td>
<c:if test="${runTask.defaultTaskType == 1 }">
<textarea class="form-control input-sm" rows="6" maxlength="666" disabled>r_model_task_agent.pl</textarea>
<input type="hidden" name="taskContext" value="r_model_task_agent.pl">
</c:if>
<c:if test="${runTask.defaultTaskType != 1 }">
<textarea class="form-control input-sm" rows="6" id="taskContextArea" maxlength="666">${runTask.taskContext}</textarea>
<input type="hidden" name="taskContext" id="taskContext" value="{runTask.taskContext}">
</c:if>
</td>
</tr>
</tbody>
</table>
</div>
</td>
</tr>
<c:if test="${runTask.defaultTaskType != 3 }"> <c:if test="${runTask.defaultTaskType != 3 }">
<tr id="taskMaxTimesRow"> <tr id="taskMaxTimesRow">
<td>最大运行次数：</td> <td>最大运行次数：</td>
...@@ -585,7 +633,12 @@ var businessOptions = new Array(); ...@@ -585,7 +633,12 @@ var businessOptions = new Array();
<td> <td>
<button type="button" id="modelSubmit" class="btn btn-primary" onclick="saveForm('taskId');">确定</button> <button type="button" id="modelSubmit" class="btn btn-primary" onclick="saveForm('taskId');">确定</button>
<!-- <button type="reset" class="btn btn-default" id="modelReset">清空</button> --> <!-- <button type="reset" class="btn btn-default" id="modelReset">清空</button> -->
<button type="reset" class="btn btn-warning" id="modelBack" onclick="abandonTask()">返回</button> <c:if test="${useType =='new'}">
<button type="reset" class="btn btn-warning" id="modelBack" onclick="abandonTask()">返回</button>
</c:if>
<c:if test="${useType =='modify'}">
<button type="reset" class="btn btn-warning" id="modelBack" onclick="window.location.href='${ctx}/BaseManage/TaskManage/taskListFrame?defaultTaskType=${runTask.defaultTaskType}'">返回</button>
</c:if>
</td> </td>
</tr> </tr>
</table> </table>
......
src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp
View file @ 25f2cdf0
...@@ -29,7 +29,7 @@ taskName = "自定义任务"; ...@@ -29,7 +29,7 @@ taskName = "自定义任务";
$.dialog({ $.dialog({
title: "提醒", title: "提醒",
content:"确定新增" + taskName + "？", content:"确定新增" + taskName + "？",
ok: function(){window.location.href='${ctx}/BaseManage/TaskManage/taskFormFrame?defaultTaskType=${queryCondition.defaultTaskType}'}, ok: function(){window.location.href='${ctx}/BaseManage/TaskManage/taskFormFrame?defaultTaskType=${queryCondition.defaultTaskType}'+"&type=new"},
okValue:"确定", okValue:"确定",
cancel: function(){}, cancel: function(){},
cancelValue:"取消", cancelValue:"取消",
...@@ -46,7 +46,7 @@ taskName = "自定义任务"; ...@@ -46,7 +46,7 @@ taskName = "自定义任务";
$.dialog({ $.dialog({
title: "提醒", title: "提醒",
content:"确定修改" + taskName + "？", content:"确定修改" + taskName + "？",
ok: function(){window.location.href = '${ctx}/BaseManage/TaskManage/taskFormFrame?defaultTaskType=${queryCondition.defaultTaskType}&taskId=' + id;}, ok: function(){window.location.href = '${ctx}/BaseManage/TaskManage/taskFormFrame?defaultTaskType=${queryCondition.defaultTaskType}&taskId=' + id+"&type=modify";},
okValue:"确定", okValue:"确定",
cancel: function(){}, cancel: function(){},
cancelValue:"取消", cancelValue:"取消",
...@@ -134,10 +134,31 @@ taskName = "自定义任务"; ...@@ -134,10 +134,31 @@ taskName = "自定义任务";
} }
}); });
} }
function preview(){ function preview(e){
var id = $('input[name="taskId"]:checked').val(); var id = $('input[name="taskId"]:checked').val();
parent.preview(); var taskType = '${queryCondition.defaultTaskType}';
$.ajax({
type : 'GET',
'url' : '${ctx}/BaseManage/TaskManage/modelPreview?id='+id,
data : "",
success : function(data) {
parent.OpenDialog(data,id,taskType);
}
});
}
function choseTask(){
$("#ModelPreview").attr("disabled", false);
} }
$(document).ready(function(){ $(document).ready(function(){
......
src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp
View file @ 25f2cdf0
...@@ -12,7 +12,9 @@ ...@@ -12,7 +12,9 @@
<button class="btn-sm btn btn-warning btn-sm btn-group btn-group-cog" onclick="deleteTask();">删除</button> <button class="btn-sm btn btn-warning btn-sm btn-group btn-group-cog" onclick="deleteTask();">删除</button>
<button class="btn-sm btn btn-primary btn-sm btn-group btn-group-cog" onclick="addTask();">新建</button> <button class="btn-sm btn btn-primary btn-sm btn-group btn-group-cog" onclick="addTask();">新建</button>
<%--create by afe 2017-10-26--%> <%--create by afe 2017-10-26--%>
<button class="btn-sm btn btn-primary btn-sm btn-group btn-group-cog" id="ModelPreview" onclick="preview()">模型预览</button> <c:if test="${runTask.defaultTaskType == '1' || runTask.defaultTaskType == '5' }">
<button class="btn-sm btn btn-primary btn-sm btn-group btn-group-cog" id="ModelPreview" onclick="preview()" disabled>模型预览</button>
</c:if>
</div> </div>
</div> </div>
...@@ -20,14 +22,12 @@ ...@@ -20,14 +22,12 @@
<thead> <thead>
<tr> <tr>
<th>选择</th> <th>选择</th>
<c:if test="${runTask.defaultTaskType == '1' || runTask.defaultTaskType == '5' }">
<%--2017-10-26 create by afe--%> <th>省份</th>
<%--<th>任务代码</th>--%> <th>渠道</th>
<th>省份</th> <th>业务名称</th>
<th>渠道</th> <th>指标名称</th>
<th>业务名称</th> </c:if>
<th>数据类型</th>
<th>任务名称</th> <th>任务名称</th>
<th>任务类型</th> <th>任务类型</th>
<th>任务绑定信息</th> <th>任务绑定信息</th>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<th>任务运行状态</th> <th>任务运行状态</th>
<th>下次运行时间</th> <th>下次运行时间</th>
<c:if test="${runTask.defaultTaskType != '3'}"> <c:if test="${runTask.defaultTaskType != '3'}">
<th>运行频率</th> <th>运行频率</th>
</c:if> </c:if>
</tr> </tr>
</thead> </thead>
...@@ -43,8 +43,13 @@ ...@@ -43,8 +43,13 @@
<c:forEach items="${taskList.content}" var="runTask"> <c:forEach items="${taskList.content}" var="runTask">
<tr> <tr>
<td><input type="radio" name="taskId" id="taskId" value="${runTask.taskId}" /></td> <td><input type="radio" name="taskId" id="taskId" value="${runTask.taskId}" onclick="choseTask()" /></td>
<td>${runTask.code}</td> <c:if test="${runTask.taskType.tasktypeId == '1' || runTask.taskType.tasktypeId == '5' }">
<td>${runTask.provinceView.provinceName}</td>
<td>${runTask.channelView.channelName}</td>
<td>${runTask.businessView.businessName}</td>
<td>${runTask.dimKpiView.name}</td>
</c:if>
<td>${runTask.name}</td> <td>${runTask.name}</td>
<td> <td>
<c:forEach items="${taskTypeList}" var="taskType"> <c:forEach items="${taskTypeList}" var="taskType">
...@@ -88,20 +93,20 @@ ...@@ -88,20 +93,20 @@
</td> </td>
<td><fmt:formatDate value="${runTask.taskNextrunTime}" type="both" pattern="yyyy-MM-dd HH:mm:ss" /></td> <td><fmt:formatDate value="${runTask.taskNextrunTime}" type="both" pattern="yyyy-MM-dd HH:mm:ss" /></td>
<c:if test="${runTask.defaultTaskType != '3'}"> <c:if test="${runTask.defaultTaskType != '3'}">
<td>${runTask.frequencyValue} <td>${runTask.frequencyValue}
<c:if test="${runTask.frequencyType == '1'}"> <c:if test="${runTask.frequencyType == '1'}">
分钟 分钟
</c:if> </c:if>
<c:if test="${runTask.frequencyType == '2'}"> <c:if test="${runTask.frequencyType == '2'}">
小时 小时
</c:if> </c:if>
<c:if test="${runTask.frequencyType == '3'}"> <c:if test="${runTask.frequencyType == '3'}">
天 天
</c:if> </c:if>
<c:if test="${runTask.frequencyType == '4'}"> <c:if test="${runTask.frequencyType == '4'}">
月 月
</c:if> </c:if>
</td> </td>
</c:if> </c:if>
</tr> </tr>
</c:forEach> </c:forEach>
......
src/main/webapp/WEB-INF/views/error/500.jsp
View file @ 25f2cdf0
...@@ -9,16 +9,12 @@ ...@@ -9,16 +9,12 @@
ex = exception; ex = exception;
if (request.getAttribute("javax.servlet.error.exception") != null) if (request.getAttribute("javax.servlet.error.exception") != null)
ex = (Throwable) request.getAttribute("javax.servlet.error.exception"); ex = (Throwable) request.getAttribute("javax.servlet.error.exception");
%>
if(ex.getMessage().substring(0, 6).equals("R_HOME")){%>--%> <c:set value="<%=ex.toString() %>" var="msg" scope="page" />
<c:set value="服务器上的R语言环境没配置正确或者Rserve服务没有启动！" var="msg" scope="page" /> <%
<%}else{ %>
<c:set value="<%=ex.getMessage() %>" var="msg" scope="page" />
<%}
//记录日志 //记录日志
Logger logger = LoggerFactory.getLogger("500.jsp"); Logger logger = LoggerFactory.getLogger("500.jsp");
logger.error(ex.getMessage(), ex); logger.error(ex.toString(), ex);
%> %>
<!DOCTYPE html> <!DOCTYPE html>
......
src/main/webapp/WEB-INF/web.xml
View file @ 25f2cdf0
...@@ -173,6 +173,10 @@ ...@@ -173,6 +173,10 @@
<location>/WEB-INF/views/error/500.jsp</location> <location>/WEB-INF/views/error/500.jsp</location>
</error-page> </error-page>
<error-page> <error-page>
<exception-type>java.lang.Exception</exception-type>
<location>/WEB-INF/views/error/500.jsp</location>
</error-page>
<error-page>
<error-code>500</error-code> <error-code>500</error-code>
<location>/WEB-INF/views/error/500.jsp</location> <location>/WEB-INF/views/error/500.jsp</location>
</error-page> </error-page>
......
src/main/webapp/static/js/validation.js
View file @ 25f2cdf0
...@@ -110,7 +110,7 @@ function checkAndSubmit(url, data) { ...@@ -110,7 +110,7 @@ function checkAndSubmit(url, data) {
function saveForm(id) { function saveForm(id) {
var message = ""; var message = "";
if($("#"+id).val()) { if($("#useType").val()!="new") {
message = "确定修改吗？"; message = "确定修改吗？";
} else { } else {
message = "确定增加吗？"; message = "确定增加吗？";
......
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