Skip to content

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

2017年11月24 智能分析平台提交内容

--欲分析建模--数据模型管理--模型监控
parent e7202c9c
Hide whitespace changes
Inline Side-by-side
Showing with 988 additions and 332 deletions
.idea/workspace.xml
View file @ 1f031902
...@@ -6,17 +6,36 @@ ...@@ -6,17 +6,36 @@
</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="2017年11月09 智能分析平台提交内容&#10; --数据库脚本更新">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/CmszMonitorAnalysis.war" afterPath="$PROJECT_DIR$/CmszMonitorAnalysis.war" /> <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/APPEWarningDetail.java" />
<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="DELETED" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/commonmanage/RunTask.class" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/commonmanage/TaskManageController.class" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/ModelParameter.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/ModelParameter.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/PageURLController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/modelmanage/ModelMaintainController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/modelmanage/ModelMaintainController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.class" />
<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$/build/application.properties" afterPath="$PROJECT_DIR$/build/application.properties" />
<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/ModelParameter.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/ModelParameter.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/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/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/repository/ModelParameterDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ModelParameterDao.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/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/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/web/modelmanage/ModelMaintainController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/application.properties" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/application.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelMaintain.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelMaintain.jsp" />
<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/TaskManage/TaskHome.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/TaskHome.jsp" />
<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/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -30,53 +49,156 @@ ...@@ -30,53 +49,156 @@
<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="RunTask.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="98">
<caret line="206" column="28" lean-forward="false" selection-start-line="206" selection-start-column="28" selection-end-line="206" selection-end-column="28" />
<folding>
<element signature="e#4096#4097#0" expanded="true" />
<element signature="e#4122#4123#0" expanded="true" />
<element signature="e#4177#4178#0" expanded="true" />
<element signature="e#4216#4217#0" expanded="true" />
<element signature="e#4262#4263#0" expanded="true" />
<element signature="e#4299#4300#0" expanded="true" />
<element signature="e#4324#4325#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<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="296">
<caret line="179" column="17" lean-forward="false" selection-start-line="179" selection-start-column="17" selection-end-line="179" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
<element signature="method#queryResultFrame#0;class#TaskManageController#0" expanded="false" />
<element signature="method#updateStatusFrame#0;class#TaskManageController#0" expanded="false" />
<element signature="method#getModelParameterList#0;class#TaskManageController#0" expanded="false" />
<element signature="method#checkNameAndCode#0;class#TaskManageController#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Business.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Business.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="26" column="27" lean-forward="false" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="RunTaskForm.jsp" pinned="false" current-in-tab="false">
<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="-2542">
<caret line="93" column="31" lean-forward="false" selection-start-line="93" selection-start-column="31" selection-end-line="93" selection-end-column="31" />
<folding>
<element signature="n#style#0;n#head#0;n#html#0;n#!!top" expanded="false" />
<element signature="e#5082#5862#0#HTML" expanded="false" />
<element signature="e#6912#6984#0#HTML" expanded="false" />
<element signature="e#7010#8961#0#HTML" expanded="false" />
<element signature="e#7466#7546#0#HTML" expanded="false" />
<element signature="e#7609#8932#0#HTML" expanded="false" />
<element signature="e#8991#9298#0#HTML" expanded="false" />
<element signature="e#9330#9700#0#HTML" expanded="false" />
<element signature="e#9740#9924#0#HTML" expanded="false" />
<element signature="e#9954#11267#0#HTML" expanded="false" />
<element signature="e#11292#11459#0#HTML" expanded="false" />
<element signature="e#11485#11658#0#HTML" expanded="false" />
<element signature="e#11684#11763#0#HTML" expanded="false" />
<element signature="e#11790#11869#0#HTML" expanded="false" />
<element signature="e#11892#12156#0#HTML" expanded="false" />
<element signature="e#12192#12641#0#HTML" expanded="false" />
<element signature="e#12665#13147#0#HTML" expanded="false" />
<element signature="n#tr#10;n#table#0;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#tr#11;n#table#0;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#c:if#15;n#jsp:root#0;n#!!top" expanded="false" />
<element signature="n#tr#12;n#table#0;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#td#1;n#tr#13;n#table#0;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Public_ProvinceTag.tag" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/Public_ProvinceTag.tag">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1078">
<caret line="17" column="48" lean-forward="false" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PublicDao.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/PublicDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="326">
<caret line="23" column="25" lean-forward="false" selection-start-line="23" selection-start-column="25" selection-end-line="23" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
<list> <list>
<option value="Jsp File" /> <option value="Jsp File" />
<option value="Class" />
<option value="Interface" /> <option value="Interface" />
<option value="Class" />
</list> </list>
</option> </option>
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>k==7</find> <find>taskFormFrame</find>
<find>create</find> <find>UPDATE &quot;fxjm_model_parameter_info_t&quot; SET &quot;DATA_MODEL_ID&quot; = -4 WHERE &quot;PARAMETER_ID&quot; = 1</find>
<find>xcdWarningInfoViewService</find> <find>APPEWarningDetail</find>
<find>glyphicon-class</find> <find>fxjm_model_parameter_info_t</find>
<find>style</find> <find>ajax</find>
<find>exportWord</find> <find>saveForm</find>
<find>createForm</find> <find>modelSubmit</find>
<find>upload</find> <find>validation</find>
<find>window.open</find> <find>FrequencyType</find>
<find>header[7]</find> <find>modelParameterService</find>
<find>console.log</find> <find>submitTaskFrame</find>
<find>==</find> <find>submitForm</find>
<find>viewAction</find> <find>abandonTask</find>
<find>pentaho/view</find> <find>submit</find>
<find>biserver_config</find> <find>taskDeleteFrame</find>
<find>initDate</find> <find>taskListFrame</find>
<find>/home/hg</find> <find>validate</find>
<find>新建</find> <find>PublicProvinceTag</find>
<find>GJFX_warni</find> <find>section</find>
<find>XcdChangeOrderDao</find> <find>dataModelView</find>
<find>XcdChangeOrderService</find> <find>modelId</find>
<find>createInsideWorkingOrder</find> <find>datasource</find>
<find>内部</find> <find>datasourceId</find>
<find>updateRelXcdIdByWarningId</find> <find>DIM_CHANNEL_DATA_SOURCE_MAP_T</find>
<find>warningId</find> <find>ChannelDataSourceMap</find>
<find>下发协查单</find> <find>ChannelDataSourceMapDao</find>
<find>returninfo</find> <find>datasourceViewId</find>
<find>getUrlParams</find> <find>channelId</find>
<find>green-tr</find> <find>channelDataSourceMapId</find>
<find>update</find> <find>change</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>InsideXcdWorkingOrderInfoView</replace> <replace>InsideXcdWorkingOrderInfoView</replace>
</replaceStrings> </replaceStrings>
<dirStrings>
<dir>D:\代码\智能分析平台\CmszMonitorAnalysis\trunk\src\main\java\com\hp\cmsz\web\modelmanage</dir>
<dir>D:\代码\智能分析平台\CmszMonitorAnalysis\trunk\src\main\webapp\WEB-INF\views\error</dir>
<dir>D:\代码\智能分析平台\CmszMonitorAnalysis\trunk</dir>
</dirStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
...@@ -95,25 +217,6 @@ ...@@ -95,25 +217,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/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" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoService.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoVieDao.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoVieDao.java" />
...@@ -140,6 +243,31 @@ ...@@ -140,6 +243,31 @@
<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$/src/main/webapp/static/css/styles.css" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/TaskHome.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp" />
<option value="$PROJECT_DIR$/src/main/resources/application.properties" />
<option value="$PROJECT_DIR$/build/application.properties" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataModel.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/ModelParameter.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ModelParameterDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelResultController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/APPEWarningDetail.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelMaintain.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/commonmanage/RunTaskService.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/validation.js" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar!/javax/persistence/FetchType.class" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/PublicDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Business.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp" />
</list> </list>
</option> </option>
</component> </component>
...@@ -194,6 +322,7 @@ ...@@ -194,6 +322,7 @@
<pane id="AndroidView" /> <pane id="AndroidView" />
<pane id="Scope" /> <pane id="Scope" />
<pane id="Scratches" /> <pane id="Scratches" />
<pane id="PackagesPane" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -201,26 +330,20 @@ ...@@ -201,26 +330,20 @@
<item name="trunk" type="b2602c69:ProjectViewProjectNode" /> <item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" type="462c0819:PsiDirectoryNode" /> <item name="trunk" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" type="462c0819:PsiDirectoryNode" />
<item name="数据库脚本" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="project.structure.last.edited" value="Artifacts" /> <property name="project.structure.last.edited" value="Modules" />
<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="project.propDebugger" />
<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 +580,10 @@ ...@@ -457,6 +580,10 @@
<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="1511144873872" duration="1448000" />
<workItem from="1511228003131" duration="3743000" />
<workItem from="1511332805883" duration="13587000" />
<workItem from="1511403483208" duration="36296000" />
</task> </task>
<task id="LOCAL-00001" summary="first commit"> <task id="LOCAL-00001" summary="first commit">
<created>1507828551888</created> <created>1507828551888</created>
...@@ -532,10 +659,10 @@ ...@@ -532,10 +659,10 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="213873000" /> <option name="totallyTimeSpent" value="269383000" />
</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="4" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.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" />
...@@ -548,29 +675,29 @@ ...@@ -548,29 +675,29 @@
<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="5" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3223684" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="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="10" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.59375" sideWeight="0.4939394" 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.3972973" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3972973" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.7582237" sideWeight="0.4939394" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.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.28787878" 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="12" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" /> <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="14" 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="2" 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="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="3" 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" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -592,6 +719,7 @@ ...@@ -592,6 +719,7 @@
<entry key="MAIN"> <entry key="MAIN">
<value> <value>
<State> <State>
<option name="BEK_SORT_TYPE" value="1" />
<option name="RECENTLY_FILTERED_USER_GROUPS"> <option name="RECENTLY_FILTERED_USER_GROUPS">
<collection /> <collection />
</option> </option>
...@@ -638,7 +766,7 @@ ...@@ -638,7 +766,7 @@
<option name="timeStamp" value="17" /> <option name="timeStamp" value="17" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>
<option name="time" value="28" /> <option name="time" value="31" />
</breakpoint-manager> </breakpoint-manager>
<watches-manager /> <watches-manager />
</component> </component>
...@@ -655,361 +783,471 @@ ...@@ -655,361 +783,471 @@
</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/commons/utils/Constant.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="85">
<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="14" column="32" lean-forward="false" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
<folding />
</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/entity/AppData.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="150">
<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="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="16" selection-end-column="25" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/JCS_datasource_channle.tag"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelParameterConfiguration.jsp">
<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="276">
<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="378" column="93" lean-forward="false" selection-start-line="378" selection-start-column="93" selection-end-line="378" selection-end-column="93" />
<folding>
<marker date="1510148642792" expanded="true" signature="12804:12810" ph="&amp;nbsp;" />
<marker date="1510148642792" expanded="true" signature="12810:12816" ph="&amp;nbsp;" />
</folding>
</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/entity/DataModelType.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="128">
<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="17" column="13" lean-forward="false" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
<folding />
</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/repository/ModelParameterDao.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="164">
<caret line="16" column="26" lean-forward="false" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" /> <caret line="33" column="24" lean-forward="true" selection-start-line="33" selection-start-column="24" selection-end-line="33" selection-end-column="24" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_FocusDataDao.java"> <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="198"> <state relative-caret-position="326">
<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="320" column="56" lean-forward="true" selection-start-line="320" selection-start-column="56" selection-end-line="320" selection-end-column="56" />
<folding />
</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/webapp/WEB-INF/views/ModelManage/ModelMonitor.jsp">
<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="-300">
<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="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoView.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/TaskHome.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238"> <state relative-caret-position="-110">
<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="34" column="0" lean-forward="true" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
<folding />
</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/PageURLController.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="194">
<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="210" column="85" lean-forward="false" selection-start-line="210" selection-start-column="74" selection-end-line="210" selection-end-column="85" />
<folding />
</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/table.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="22">
<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="1" column="9" lean-forward="false" selection-start-line="1" selection-start-column="9" selection-end-line="1" selection-end-column="9" />
<folding>
<marker date="1486961692000" expanded="true" signature="9572:9582" ph="..." />
</folding>
</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/webapp/WEB-INF/views/ModelManage/ModelResult.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-66"> <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="289" column="40" lean-forward="false" selection-start-line="289" selection-start-column="40" selection-end-line="289" selection-end-column="40" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdWarningInfoViewDao.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/APPEWarningDetail.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="132">
<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="6" column="39" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/docx4j-3.1.0.jar!/org/docx4j/openpackaging/packages/OpcPackage.class"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/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="2684">
<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="257" column="48" lean-forward="true" selection-start-line="257" selection-start-column="48" selection-end-line="257" selection-end-column="48" />
<folding />
</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/WEB-INF/views/MonitorOperation/InsideXcd.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274"> <state relative-caret-position="153">
<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="199" column="73" lean-forward="true" selection-start-line="199" selection-start-column="25" selection-end-line="199" selection-end-column="73" />
<folding>
<marker date="1511144121265" expanded="true" signature="13862:13918" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.gitignore"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/TaskType.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396"> <state relative-caret-position="-396">
<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="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/modelResultDetailTable.js"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="351"> <state relative-caret-position="-1223">
<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="70" column="55" lean-forward="false" selection-start-line="70" selection-start-column="34" selection-end-line="70" selection-end-column="55" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/default.jsp"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java">
<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="98">
<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="95" column="46" lean-forward="false" selection-start-line="95" selection-start-column="30" selection-end-line="95" selection-end-column="46" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoViewDao.java"> <entry file="file://$PROJECT_DIR$/src/main/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="478"> <state relative-caret-position="198">
<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="12" column="90" lean-forward="false" selection-start-line="12" selection-start-column="90" selection-end-line="12" selection-end-column="90" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/PeriodTag.tag"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/ModelParameter.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286"> <state relative-caret-position="-12">
<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="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/build.xml"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelMaintain.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264"> <state relative-caret-position="242">
<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="256" column="16" lean-forward="false" selection-start-line="256" selection-start-column="16" selection-end-line="263" selection-end-column="18" />
<folding /> <folding>
<marker date="1511438610913" expanded="true" signature="10247:10253" ph="&amp;nbsp;" />
<marker date="1511438610913" expanded="true" signature="10253:10259" ph="&amp;nbsp;" />
</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://$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="146"> <state relative-caret-position="194">
<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="55" column="0" lean-forward="false" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoViewService.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp">
<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="307">
<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="65" column="27" lean-forward="false" selection-start-line="65" selection-start-column="27" selection-end-line="65" selection-end-column="27" />
<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/tags/GZFX_Provider_stats.tag">
<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="0">
<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="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/数据库脚本/201710/view.sql"> <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="110"> <state relative-caret-position="382">
<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="66" column="86" lean-forward="false" selection-start-line="66" selection-start-column="86" selection-end-line="66" selection-end-column="86" />
<folding>
<element signature="n#style#0;n#iframe#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
<marker date="1511488800670" expanded="true" signature="2274:2330" ph="..." />
</folding>
</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/entity/commonmanage/RunTaskDetail.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="194">
<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="28" column="32" lean-forward="false" selection-start-line="28" selection-start-column="32" selection-end-line="28" selection-end-column="32" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdWarningInfoView.java"> <entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/spring-data-commons-1.5.1.RELEASE.jar!/org/springframework/data/repository/CrudRepository.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264"> <state relative-caret-position="194">
<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="16" column="26" lean-forward="false" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.java"> <entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar!/javax/persistence/FetchType.class">
<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="7" column="10" lean-forward="false" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
<folding />
</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/entity/commonmanage/TaskGroup.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="110">
<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="14" column="30" lean-forward="false" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="30" />
<folding />
</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/service/commonmanage/RunTaskService.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="414">
<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="144" column="22" lean-forward="false" selection-start-line="144" selection-start-column="22" selection-end-line="144" selection-end-column="22" />
<folding>
<element signature="e#5318#5319#0" expanded="false" />
<element signature="e#5372#5373#0" expanded="false" />
</folding>
</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/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="198"> <state relative-caret-position="418">
<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="107" column="0" lean-forward="true" selection-start-line="107" selection-start-column="0" selection-end-line="107" selection-end-column="0" />
<folding />
</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/service/PublicService.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="250">
<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="30" column="42" lean-forward="false" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" />
<folding>
<element signature="e#511#512#0" expanded="false" />
<element signature="e#566#567#0" expanded="false" />
<element signature="e#611#612#0" expanded="false" />
<element signature="e#665#666#0" expanded="false" />
</folding>
</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/webapp/WEB-INF/tags/GJFX_datasource_channle_business.tag">
<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="-1122">
<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="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdChangeOrderService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/PublicProvinceTagController.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="-80">
<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="44" column="45" lean-forward="false" selection-start-line="44" selection-start-column="45" selection-end-line="44" selection-end-column="45" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.java"> <entry file="file://$PROJECT_DIR$/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="186"> <state relative-caret-position="86">
<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="551" column="60" lean-forward="false" selection-start-line="551" selection-start-column="60" selection-end-line="551" selection-end-column="60" />
<folding>
<marker date="1511144121277" expanded="true" signature="47293:47349" ph="..." />
<marker date="1511144121277" expanded="true" signature="47572:47583" ph="..." />
</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/tags/Public_ProvinceTag.tag">
<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="-1078">
<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="17" column="48" lean-forward="false" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="48" />
<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/PublicDao.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="326">
<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="23" column="25" lean-forward="false" selection-start-line="23" selection-start-column="25" selection-end-line="23" selection-end-column="25" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/GjfxRelatedInsideWorkingOrder.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/BusinessDao.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="-94">
<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="16" column="17" lean-forward="false" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-532"> <state relative-caret-position="282">
<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="150" column="60" lean-forward="true" selection-start-line="150" selection-start-column="60" selection-end-line="150" selection-end-column="60" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Province.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="238">
<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="25" column="27" lean-forward="false" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="27" />
<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/DataModel.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="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
<folding />
</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/ChannelDao.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="458">
<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="34" column="0" lean-forward="true" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
<folding />
</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/service/ChannelDataSourceMapService.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="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="19" column="26" lean-forward="false" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ChannelDataSourceMapDao.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="216">
<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="19" column="40" lean-forward="false" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="40" />
<folding />
</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/service/BusinessService.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="128">
<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="27" column="20" lean-forward="false" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
<folding />
</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/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="164"> <state relative-caret-position="172">
<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="19" column="33" lean-forward="false" selection-start-line="19" selection-start-column="15" selection-end-line="19" selection-end-column="33" />
<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/entity/DataSource.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="172">
<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="19" column="37" lean-forward="false" selection-start-line="19" selection-start-column="15" selection-end-line="19" selection-end-column="37" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp"> <entry file="file://$PROJECT_DIR$/src/main/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="93"> <state relative-caret-position="98">
<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="206" column="28" lean-forward="false" selection-start-line="206" selection-start-column="28" selection-end-line="206" selection-end-column="28" />
<folding>
<element signature="e#4096#4097#0" expanded="true" />
<element signature="e#4122#4123#0" expanded="true" />
<element signature="e#4177#4178#0" expanded="true" />
<element signature="e#4216#4217#0" expanded="true" />
<element signature="e#4262#4263#0" expanded="true" />
<element signature="e#4299#4300#0" expanded="true" />
<element signature="e#4324#4325#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcd.jsp"> <entry file="file://$PROJECT_DIR$/src/main/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="8"> <state relative-caret-position="-2542">
<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="93" column="31" lean-forward="false" selection-start-line="93" selection-start-column="31" selection-end-line="93" selection-end-column="31" />
<folding>
<element signature="n#style#0;n#head#0;n#html#0;n#!!top" expanded="false" />
<element signature="e#5082#5862#0#HTML" expanded="false" />
<element signature="e#6912#6984#0#HTML" expanded="false" />
<element signature="e#7010#8961#0#HTML" expanded="false" />
<element signature="e#7466#7546#0#HTML" expanded="false" />
<element signature="e#7609#8932#0#HTML" expanded="false" />
<element signature="e#8991#9298#0#HTML" expanded="false" />
<element signature="e#9330#9700#0#HTML" expanded="false" />
<element signature="e#9740#9924#0#HTML" expanded="false" />
<element signature="e#9954#11267#0#HTML" expanded="false" />
<element signature="e#11292#11459#0#HTML" expanded="false" />
<element signature="e#11485#11658#0#HTML" expanded="false" />
<element signature="e#11684#11763#0#HTML" expanded="false" />
<element signature="e#11790#11869#0#HTML" expanded="false" />
<element signature="e#11892#12156#0#HTML" expanded="false" />
<element signature="e#12192#12641#0#HTML" expanded="false" />
<element signature="e#12665#13147#0#HTML" expanded="false" />
<element signature="n#tr#10;n#table#0;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#tr#11;n#table#0;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#c:if#15;n#jsp:root#0;n#!!top" expanded="false" />
<element signature="n#tr#12;n#table#0;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#td#1;n#tr#13;n#table#0;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</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/entity/ChannelDataSourceMap.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="220">
<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="23" column="29" lean-forward="false" selection-start-line="23" selection-start-column="17" selection-end-line="23" selection-end-column="29" />
<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/web/commonmanage/TaskManageController.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="296">
<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="179" column="17" lean-forward="false" selection-start-line="179" selection-start-column="17" selection-end-line="179" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
<element signature="method#queryResultFrame#0;class#TaskManageController#0" expanded="false" />
<element signature="method#updateStatusFrame#0;class#TaskManageController#0" expanded="false" />
<element signature="method#getModelParameterList#0;class#TaskManageController#0" expanded="false" />
<element signature="method#checkNameAndCode#0;class#TaskManageController#0" expanded="false" />
</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/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="22"> <state relative-caret-position="194">
<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="26" column="27" lean-forward="false" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="27" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -1021,10 +1259,10 @@ ...@@ -1021,10 +1259,10 @@
<settings> <settings>
<artifact-editor> <artifact-editor>
<show-content> <show-content>
<type id="artifact" /> <type id="jpa-descriptors" />
<type id="javaee-facet-resources" /> <type id="javaee-facet-resources" />
<type id="artifact" />
<type id="library" /> <type id="library" />
<type id="jpa-descriptors" />
</show-content> </show-content>
</artifact-editor> </artifact-editor>
<last-edited>CmszMonitorAnalysis</last-edited> <last-edited>CmszMonitorAnalysis</last-edited>
......
build/application.properties
View file @ 1f031902
...@@ -12,7 +12,7 @@ local.ip.prefix=192.168 ...@@ -12,7 +12,7 @@ local.ip.prefix=192.168
#jdbc.driver=com.vertica.jdbc.Driver #jdbc.driver=com.vertica.jdbc.Driver
#vertica database ip address #vertica database ip address
jdbc.dbip=192.168.113.117 jdbc.dbip=hg-computer
jdbc.dbport=5433 jdbc.dbport=5433
......
src/main/java/com/hp/cmsz/entity/APPEWarningDetail.java 0 → 100644
View file @ 1f031902
//package com.hp.cmsz.entity;
//
//import javax.persistence.Entity;
//import javax.persistence.Table;
//
//@Entity
//@Table(name="etl.APP_EWARNING_DETAIL_T")
//public class APPEWarningDetail {
// private Long EwarningDetailId;
//// private Long EwarningDetailId;
//
//
//
//}
src/main/java/com/hp/cmsz/entity/Business.java
View file @ 1f031902
...@@ -17,7 +17,7 @@ import javax.persistence.Table; ...@@ -17,7 +17,7 @@ import javax.persistence.Table;
* *
*/ */
@Entity @Entity
@Table(name = "dim_business_info_t") @Table(name = "dim_business_info_t",schema="ccolap")
public class Business implements Serializable{ public class Business implements Serializable{
private Long businessId ;//业务ID private Long businessId ;//业务ID
......
src/main/java/com/hp/cmsz/entity/ModelParameter.java
View file @ 1f031902
...@@ -25,7 +25,9 @@ public class ModelParameter implements Serializable{ ...@@ -25,7 +25,9 @@ public class ModelParameter implements Serializable{
private String parameterValue;//参数值 private String parameterValue;//参数值
private String parameterDataType;//参数数据类型 private String parameterDataType;//参数数据类型
private Long dataModelId;//数据模型ID private Long dataModelId;//数据模型ID
private Long taskId;//任务表ID
private Long ifSystemDefault;//是否系统默认
@Id @Id
@GeneratedValue(strategy=GenerationType.SEQUENCE, generator="ModelParameterSequence") @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="ModelParameterSequence")
@SequenceGenerator(name = "ModelParameterSequence", sequenceName = "fxjm_model_parameter_info_t_seq", allocationSize=1) @SequenceGenerator(name = "ModelParameterSequence", sequenceName = "fxjm_model_parameter_info_t_seq", allocationSize=1)
...@@ -59,7 +61,16 @@ public class ModelParameter implements Serializable{ ...@@ -59,7 +61,16 @@ public class ModelParameter implements Serializable{
public void setDataModelId(Long dataModelId) { public void setDataModelId(Long dataModelId) {
this.dataModelId = dataModelId; this.dataModelId = dataModelId;
} }
public Long getTaskId() {
return taskId;
}
public void setTaskId(Long taskId) {
this.taskId = taskId;
}
public Long getIfSystemDefault() {
return ifSystemDefault;
}
public void setIfSystemDefault(Long ifSystemDefault) {
this.ifSystemDefault = ifSystemDefault;
}
} }
src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java
View file @ 1f031902
...@@ -3,6 +3,7 @@ package com.hp.cmsz.entity.commonmanage; ...@@ -3,6 +3,7 @@ package com.hp.cmsz.entity.commonmanage;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.List;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.FetchType; import javax.persistence.FetchType;
...@@ -17,18 +18,13 @@ import javax.persistence.Temporal; ...@@ -17,18 +18,13 @@ import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
import javax.persistence.Transient; import javax.persistence.Transient;
import com.hp.cmsz.entity.DataModel; import com.hp.cmsz.entity.*;
@Entity @Entity
@Table(name = "RUN_TASK_T", schema = "ETL") @Table(name = "RUN_TASK_T", schema = "ETL")
public class RunTask { public class RunTask {
@Id @Id
//@TableGenerator(name = "ID_GENERATOR", table = "ID_GEN", pkColumnName = "GEN_NAME", pkColumnValue = "NBR_PK", valueColumnName = "GEN_VALUE", allocationSize = 1)
//@GeneratedValue(strategy = GenerationType.TABLE, generator = "ID_GENERATOR")
/*@GenericGenerator(name = "idGenerator", strategy = "uuid")
@GeneratedValue(generator = "idGenerator")*/
//@GeneratedValue(strategy = GenerationType.IDENTITY)
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "RunTaskSequence") @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "RunTaskSequence")
@SequenceGenerator(name = "RunTaskSequence", sequenceName = "run_task_t_seq", allocationSize = 1) @SequenceGenerator(name = "RunTaskSequence", sequenceName = "run_task_t_seq", allocationSize = 1)
private Long taskId; private Long taskId;
...@@ -51,7 +47,28 @@ public class RunTask { ...@@ -51,7 +47,28 @@ public class RunTask {
@ManyToOne(fetch = FetchType.EAGER) @ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "MODEL_ID") @JoinColumn(name = "MODEL_ID")
private DataModel dataModelView; private DataModel dataModelView;
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "province_id")
private Province provinceView;
private Long kpiId;
// @ManyToOne(fetch = FetchType.EAGER)
// @JoinColumn(name = "channel_id")
// private Channel channelView;
//
// @ManyToOne(fetch = FetchType.EAGER)
// @JoinColumn(name = "dataSource_id")
// private DataSource dataSourceView;
// @ManyToOne(fetch = FetchType.EAGER)
// @JoinColumn(name = "business_id")
// private Business businessView;
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date taskNextrunTime; private Date taskNextrunTime;
...@@ -179,7 +196,46 @@ public class RunTask { ...@@ -179,7 +196,46 @@ public class RunTask {
this.taskContext = taskContext; this.taskContext = taskContext;
} }
/*public String getParallelFlg() { public Province getProvinceView() {
return provinceView;
}
public void setProvinceView(Province provinceView) {
this.provinceView = provinceView;
}
public Long getKpiId() {
return kpiId;
}
public void setKpiId(Long kpiId) {
this.kpiId = kpiId;
}
// public Channel getChannelView() {
// return channelView;
// }
//
// public void setChannelView(Channel channelView) {
// this.channelView = channelView;
// }
//
// public DataSource getDataSourceView() {
// return dataSourceView;
// }
//
// public void setDataSourceView(DataSource dataSourceView) {
// this.dataSourceView = dataSourceView;
// }
//
// public Business getBusinessView() {
// return businessView;
// }
//
// public void setBusinessView(Business businessView) {
// this.businessView = businessView;
// }
/*public String getParallelFlg() {
return parallelFlg; return parallelFlg;
} }
......
src/main/java/com/hp/cmsz/repository/ModelParameterDao.java
View file @ 1f031902
...@@ -27,9 +27,12 @@ public interface ModelParameterDao extends JpaSpecificationExecutor<ModelParamet ...@@ -27,9 +27,12 @@ public interface ModelParameterDao extends JpaSpecificationExecutor<ModelParamet
@Modifying @Modifying
@Query("update ModelParameter mp set mp.parameterName=:parameterName,mp.parameterValue=:parameterValue, mp.parameterDataType=:parameterDataType where mp.parameterId =:parameterId") @Query("update ModelParameter mp set mp.parameterName=:parameterName,mp.parameterValue=:parameterValue, mp.parameterDataType=:parameterDataType where mp.parameterId =:parameterId")
void updateParamByParameterId(@Param("parameterName")String parameterName,@Param("parameterValue")String parameterValue,@Param("parameterDataType")String parameterDataType,@Param("parameterId")Long parameterId); void updateParamByParameterId(@Param("parameterName")String parameterName,@Param("parameterValue")String parameterValue,@Param("parameterDataType")String parameterDataType,@Param("parameterId")Long parameterId);
//根据数据模型ID查找参数d //根据数据模型ID查找参数d
List<ModelParameter> findByDataModelId(Long dataModelId); List<ModelParameter> findByDataModelId(Long dataModelId);
//根据数据模型ID查找系统默认的参数d
List<ModelParameter> findByDataModelIdAndIfSystemDefault(Long dataModelId, Long ifSystemDefault);
//根据数据模型ID查找参数d //根据数据模型ID查找参数d
List<ModelParameter> findByDataModelIdIn(List<Long> dataModelId); List<ModelParameter> findByDataModelIdIn(List<Long> dataModelId);
......
src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java
View file @ 1f031902
package com.hp.cmsz.web.commonmanage; package com.hp.cmsz.web.commonmanage;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.List;
//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.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;
...@@ -19,6 +25,9 @@ import com.hp.cmsz.service.commonmanage.RunTaskService; ...@@ -19,6 +25,9 @@ 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 {
...@@ -31,6 +40,25 @@ public class TaskManageController { ...@@ -31,6 +40,25 @@ public class TaskManageController {
@Autowired @Autowired
private CmszOperationLogService cmszOperationLogService; private CmszOperationLogService cmszOperationLogService;
@Autowired
private ModelParameterDao modelParameterDao;
@Autowired
private ChannelDao channelDao;
@Autowired
private DataSourceDao dataSourceDao;
@Autowired
private BusinessDao businessDao;
@Autowired
private com.hp.cmsz.repository.PublicDao PublicDao;
@Autowired
private ChannelDataSourceMapDao channelDataSourceMapDao;
@RequestMapping(value = "/taskHome") @RequestMapping(value = "/taskHome")
public ModelAndView taskHome(String selectTab) { public ModelAndView taskHome(String selectTab) {
ModelAndView modelAndView = new ModelAndView(PageURLController.TaskHome); ModelAndView modelAndView = new ModelAndView(PageURLController.TaskHome);
...@@ -80,6 +108,7 @@ public class TaskManageController { ...@@ -80,6 +108,7 @@ public class TaskManageController {
} }
Page<RunTask> taskList = runTaskService.getRunTaskPage(runTask, pageNumber, pageSize, sortType); Page<RunTask> taskList = runTaskService.getRunTaskPage(runTask, pageNumber, pageSize, sortType);
System.out.println(taskList.getSize());
modelAndView.addObject("taskList", taskList); modelAndView.addObject("taskList", taskList);
//modelAndView.addObject("queryCondition", runTask); //modelAndView.addObject("queryCondition", runTask);
modelAndView.addObject("pageSize", pageSize); modelAndView.addObject("pageSize", pageSize);
...@@ -125,19 +154,49 @@ public class TaskManageController { ...@@ -125,19 +154,49 @@ public class TaskManageController {
runTask = runTaskService.getRunTask(taskId); runTask = runTaskService.getRunTask(taskId);
} else { } else {
runTask = new RunTask(); runTask = new RunTask();
runTaskService.saveRunTask(runTask);//能够让模型参数根据任务id来进行关联，先把taskId传到前端
} }
if (StringUtils.isNotEmpty(defaultTaskType)) { if (StringUtils.isNotEmpty(defaultTaskType)) {
runTask.setDefaultTaskType(new Long(defaultTaskType)); runTask.setDefaultTaskType(new Long(defaultTaskType));
} }
//模型列表
List<DataModel> dataModelList = runTaskService.getDataModelViewList();
//默认第一个模型的参数列表
List<ModelParameter> modelParameterList = null;
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("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("isModel", isModel);
modelAndView.addObject("taskGroupList", runTaskService.getTaskGroupList()); modelAndView.addObject("taskGroupList", runTaskService.getTaskGroupList());
/*modelAndView.addObject("taskTypeList", runTaskService.getTaskTypeList());*/ /*modelAndView.addObject("taskTypeList", runTaskService.getTaskTypeList());*/
modelAndView.addObject("sanboxList", taskDetailService.findTaskList(RunTaskDetail.TASK_TYPE_SANDBOX)); modelAndView.addObject("sanboxList", taskDetailService.findTaskList(RunTaskDetail.TASK_TYPE_SANDBOX));
modelAndView.addObject("recoverList", taskDetailService.findTaskList(RunTaskDetail.TASK_TYPE_RECOVER)); modelAndView.addObject("recoverList", taskDetailService.findTaskList(RunTaskDetail.TASK_TYPE_RECOVER));
modelAndView.addObject("dataModelList", runTaskService.getDataModelViewList()); modelAndView.addObject("dataModelList", dataModelList);
modelAndView.addObject("dataModelParameterList", modelParameterList);
modelAndView.addObject("taskTypeList", runTaskService.getTaskTypeList()); modelAndView.addObject("taskTypeList", runTaskService.getTaskTypeList());
cmszOperationLogService.createLog("新增", "模型任务", "RUN_TASK_T.taskId=" + runTask.getTaskId());
return modelAndView; return modelAndView;
} }
...@@ -175,6 +234,37 @@ public class TaskManageController { ...@@ -175,6 +234,37 @@ public class TaskManageController {
return url; 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="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") @RequestMapping(value = "/taskDeleteFrame")
public String taskDeleteFrame(Long taskId, @RequestParam(required = false) String defaultTaskType) { public String taskDeleteFrame(Long taskId, @RequestParam(required = false) String defaultTaskType) {
runTaskService.deleteRunTask(taskId); runTaskService.deleteRunTask(taskId);
...@@ -198,4 +288,13 @@ public class TaskManageController { ...@@ -198,4 +288,13 @@ public class TaskManageController {
@RequestParam(required = false) String defaultTaskType) throws UnsupportedEncodingException { @RequestParam(required = false) String defaultTaskType) throws UnsupportedEncodingException {
return runTaskService.checkNameAndCode(java.net.URLDecoder.decode(name, "UTF-8"), code, id, defaultTaskType); return runTaskService.checkNameAndCode(java.net.URLDecoder.decode(name, "UTF-8"), code, id, defaultTaskType);
} }
// public APPEWarningDetail ModelPreview(String id){
//
//
// return null;
// };
} }
\ No newline at end of file
src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java
View file @ 1f031902
...@@ -109,9 +109,8 @@ public class ModelMaintainController { ...@@ -109,9 +109,8 @@ public class ModelMaintainController {
if(!paramName.trim().equals("")){modelParameter.setParameterName(paramName);} if(!paramName.trim().equals("")){modelParameter.setParameterName(paramName);}
if(!paramValue.trim().equals("")){modelParameter.setParameterValue(paramValue);} if(!paramValue.trim().equals("")){modelParameter.setParameterValue(paramValue);}
if(!paramType.trim().equals("")){modelParameter.setParameterDataType(paramType);} if(!paramType.trim().equals("")){modelParameter.setParameterDataType(paramType);}
modelParameter.setIfSystemDefault(0L);
modelParameterDao.save(modelParameter); modelParameterDao.save(modelParameter);
Long dataModelId = modelParameter.getParameterId(); Long dataModelId = modelParameter.getParameterId();
dataModelIdList.add(dataModelId); dataModelIdList.add(dataModelId);
} }
...@@ -187,7 +186,7 @@ public class ModelMaintainController { ...@@ -187,7 +186,7 @@ public class ModelMaintainController {
File file = new File(modelSavePath,modelExeScriptName); File file = new File(modelSavePath,modelExeScriptName);
if(!file.exists()){ if(!file.exists()){
fm.write(file); fm.write(file);
} }
} }
} }
} }
...@@ -222,11 +221,11 @@ public class ModelMaintainController { ...@@ -222,11 +221,11 @@ public class ModelMaintainController {
List<DeployedServer> deployedServerList = deployedServerDao.findByServerId(Long.parseLong(deployedServer)); List<DeployedServer> deployedServerList = deployedServerDao.findByServerId(Long.parseLong(deployedServer));
if(!deployedServerList.isEmpty()){ if(!deployedServerList.isEmpty()){
if(deployedServerList.get(0).getIfWebserver().equals("0")){ if(deployedServerList.get(0).getIfWebserver().equals("0")){
String ftpServer = deployedServerList.get(0).getServerIpAddress(); String ftpServer = deployedServerList.get(0).getServerIpAddress();
String ftpUser = deployedServerList.get(0).getFtpUser(); String ftpUser = deployedServerList.get(0).getFtpUser();
String ftpPwd = deployedServerList.get(0).getFtpPassword(); String ftpPwd = deployedServerList.get(0).getFtpPassword();
String ftpFilePath = modelSavePath; String ftpFilePath = modelSavePath;
String ftpFileName = modelExeScriptName; String ftpFileName = modelExeScriptName;
FileInputStream ftpFileInput = null; FileInputStream ftpFileInput = null;
......
src/main/java/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.java
View file @ 1f031902
...@@ -103,7 +103,7 @@ public class ModelParameterConfigurationController { ...@@ -103,7 +103,7 @@ public class ModelParameterConfigurationController {
if(!dataModelId.trim().equals("")){ if(!dataModelId.trim().equals("")){
dataModel = dataModelDao.findByDataModelId(Long.parseLong(dataModelId)); dataModel = dataModelDao.findByDataModelId(Long.parseLong(dataModelId));
modelParameterList = modelParameterDao.findByDataModelId(Long.parseLong(dataModelId)); modelParameterList = modelParameterDao.findByDataModelIdAndIfSystemDefault(Long.parseLong(dataModelId),0L);
} }
......
src/main/java/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.java
View file @ 1f031902
...@@ -180,7 +180,7 @@ public class RegularityAnalysisController { ...@@ -180,7 +180,7 @@ public class RegularityAnalysisController {
s.eval("library('YWGL')"); s.eval("library('YWGL')");
s.set("analysisType", 1);//同省同渠道多业务 s.set("analysisType", 1);//同省同渠道多业务
double[] province = { 26 };//贵州 double[] province = { 26 };//贵州
s.set("province", province); s.set("province", province);
s.set("city", -1); s.set("city", -1);
s.set("bacType", -1); s.set("bacType", -1);
...@@ -428,6 +428,9 @@ public class RegularityAnalysisController { ...@@ -428,6 +428,9 @@ public class RegularityAnalysisController {
//Comment by Huach on 20140731 begin //Comment by Huach on 20140731 begin
String dbConXml =Constant.CONFIG_FILE;// "/home/pentaho/conf" + System.getProperty("file.separator") + "application.properties"; String dbConXml =Constant.CONFIG_FILE;// "/home/pentaho/conf" + System.getProperty("file.separator") + "application.properties";
//Comment by Huach on 20140731 end //Comment by Huach on 20140731 end
System.out.println("-=====");
System.out.println(PropertiesUtil.readValue(dbConXml, "jdbc.dbip"));
System.out.println("======");
s.set("dbHost", PropertiesUtil.readValue(dbConXml, "jdbc.dbip")); s.set("dbHost", PropertiesUtil.readValue(dbConXml, "jdbc.dbip"));
s.set("dbPort", Integer.valueOf(PropertiesUtil.readValue(dbConXml, "jdbc.dbport"))); s.set("dbPort", Integer.valueOf(PropertiesUtil.readValue(dbConXml, "jdbc.dbport")));
......
src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java
View file @ 1f031902
...@@ -138,7 +138,7 @@ public class WorkingOrderManageControll { ...@@ -138,7 +138,7 @@ public class WorkingOrderManageControll {
model.put("xcdWarningInfoJson", gson.toJson(xcdWarningInfoS)); model.put("xcdWarningInfoJson", gson.toJson(xcdWarningInfoS));
//model.put("imgList", gson.toJson(imgList)); //model.put("imgList", gson.toJson(imgList));
//查询出所有的告警来源 //查询出所有的告警来源
List<WarningSource> warningSourceList=warningSourceService.getAllWarningSource(); List<WarningSource> warningSourceList=warningSourceService.getAllWarningSource();
//查询出所有的渠道信息 //查询出所有的渠道信息
......
src/main/resources/application.properties
View file @ 1f031902
...@@ -12,7 +12,7 @@ local.ip.prefix=192.168 ...@@ -12,7 +12,7 @@ local.ip.prefix=192.168
#jdbc.driver=com.vertica.jdbc.Driver #jdbc.driver=com.vertica.jdbc.Driver
#vertica database ip address #vertica database ip address
jdbc.dbip=192.168.113.117 jdbc.dbip=hg-computer
jdbc.dbport=5433 jdbc.dbport=5433
......
src/main/webapp/WEB-INF/classes/application.properties
View file @ 1f031902
...@@ -12,7 +12,7 @@ local.ip.prefix=192.168 ...@@ -12,7 +12,7 @@ local.ip.prefix=192.168
#jdbc.driver=com.vertica.jdbc.Driver #jdbc.driver=com.vertica.jdbc.Driver
#vertica database ip address #vertica database ip address
jdbc.dbip=192.168.113.117 jdbc.dbip=hg-computer
jdbc.dbport=5433 jdbc.dbport=5433
......
src/main/webapp/WEB-INF/views/ModelManage/ModelMaintain.jsp
View file @ 1f031902
...@@ -263,27 +263,27 @@ ...@@ -263,27 +263,27 @@
createForm.attr("action","#"); createForm.attr("action","#");
}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 paramName = $(this).find("td").eq(0).html(); var paramName = $(this).find("td").eq(0).html();
var paramValue = $(this).find("td").eq(1).html(); var paramValue = $(this).find("td").eq(1).html();
var paramType = $(this).find("td").eq(2).html(); var paramType = $(this).find("td").eq(2).html();
$.ajax({ $.ajax({
type : "GET", type : "GET",
contentType : "application/json", contentType : "application/json",
url: "${ctx}/ModelManage/ModelMaintain/createModelParam?paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType), url: "${ctx}/ModelManage/ModelMaintain/createModelParam?paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType),
dataType : "text", dataType : "text",
async: false, async: false,
beforeSend: function(data) {}, beforeSend: function(data) {},
success: function(){ success: function(){
i--; i--;
if(i==0){ if(i==0){
var createForm=$("#modelMaintainForm"); var createForm=$("#modelMaintainForm");
createForm.attr("action","${ctx}/ModelManage/ModelMaintain/saveModelDataForm"); createForm.attr("action","${ctx}/ModelManage/ModelMaintain/saveModelDataForm");
createForm.submit(); createForm.submit();
createForm.attr("action","#"); createForm.attr("action","#");
}
} }
} });
});
}); });
} }
}, },
...@@ -291,16 +291,17 @@ ...@@ -291,16 +291,17 @@
cancel: function(){}, cancel: function(){},
cancelValue: "取消", cancelValue: "取消",
}); });
}else{ }
else{
$("#modelSubmit").attr("disabled",true); $("#modelSubmit").attr("disabled",true);
var i = $("#addTr").find("tr").size(); var i = $("#addTr").find("tr").size();
if(i==0){ if(i==0){
var createForm=$("#modelMaintainForm"); var createForm=$("#modelMaintainForm");
createForm.attr("action","${ctx}/ModelManage/ModelMaintain/saveModelDataForm"); createForm.attr("action","${ctx}/ModelManage/ModelMaintain/saveModelDataForm");
createForm.submit(); createForm.submit();
createForm.attr("action","#"); createForm.attr("action","#");
}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 paramName = $(this).find("td").eq(0).html(); var paramName = $(this).find("td").eq(0).html();
......
src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp
View file @ 1f031902
...@@ -28,6 +28,10 @@ ...@@ -28,6 +28,10 @@
$("#taskLogFrame").attr('src', '${ctx}/BaseManage/TaskLogManage/taskLogListFrame'); $("#taskLogFrame").attr('src', '${ctx}/BaseManage/TaskLogManage/taskLogListFrame');
} }
}); });
}); });
</script> </script>
...@@ -60,7 +64,7 @@ ...@@ -60,7 +64,7 @@
<div class="row me-row" style="margin-top:0px"> <div class="row me-row" style="margin-top:0px">
<div class="content clearfix"> <div class="content clearfix">
<div class="row" style="margin-top:0px"> <div class="row" style="margin-top:0px">
<iframe id="taskManageFrame" style="height:680px" scrolling="no" src="${ctx}/BaseManage/TaskManage/taskListFrame?defaultTaskType=1"> </iframe> <iframe id="taskManageFrame" style="height:800px" src="${ctx}/BaseManage/TaskManage/taskListFrame?defaultTaskType=1"> </iframe>
</div> </div>
</div> </div>
</div> </div>
...@@ -69,5 +73,60 @@ ...@@ -69,5 +73,60 @@
</div> </div>
</div> </div>
</div> </div>
<script type="">
function OpenDialog(data) {
// var data = JSON.parse(data);
var content ="<div class='dialog-p' style='max-height: 560px; overflow-y: scroll; overflow-x: auto;'>" +
" <div class='col-xs-12'>" +
" <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-body'>"+
" <table class='table table-vertical'>"+
" <tr><td>"+
" <table class='table table-vertical'>" +
" <tr>" +
" <td width='10%'>省份</td>" +
" <td>自定义</td>" +
" <td width='10%'>数据来源</td>" +
" <td>自定义</td>" +
" <td width='10%'>业务</td>" +
" <td>自定义</td>" +
" <td width='10%'>渠道</td>" +
" <td>自定义</td>" +
" </tr>" +
" <tr>" +
" <td>指标编码</td>" +
" <td>自定义</td>" +
" <td>指标名称</td>" +
" <td>自定义</td>" +
" <td>预测开始时间</td>" +
" <td>自定义</td>" +
" <td>预测结束时间</td>" +
" <td>自定义</td>" +
" </tr>" +
" <tr>" +
" <td colspan='8' align='center'>图表展示</td>" +
" </tr>" +
" <tr>" +
" <td colspan='8'>" +
" <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>" +--%>
" </div>" +
" </td>" +
" </tr>" +
"</table>";
$.dialog({
title:'模型预览结果',
content:content,
lock: true
});
}
function preview() {
OpenDialog();
}
</script>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp
View file @ 1f031902
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</style> </style>
<script type="text/javascript" src="${ctx}/static/js/validation.js"></script> <script type="text/javascript" src="${ctx}/static/js/validation.js"></script>
<script language="javascript"> <script language="javascript" type="text/javascript">
var sandboxOptions = new Array(); var sandboxOptions = new Array();
var recoverOptions = new Array(); var recoverOptions = new Array();
var dataModelOptions = new Array(); var dataModelOptions = new Array();
...@@ -34,6 +34,10 @@ var minuteOption = new Array(); ...@@ -34,6 +34,10 @@ var minuteOption = new Array();
var hourOption = new Array(); var hourOption = new Array();
var dayOption = new Array(); var dayOption = new Array();
var monthOption = new Array(); var monthOption = new Array();
var provinceOptions = new Array();
var datasourceOptions = new Array();
var channelOptions = new Array();
var businessOptions = new Array();
$(document).ready(function() { $(document).ready(function() {
changeInputStatus('parallelFlg', 'parallelNums'); changeInputStatus('parallelFlg', 'parallelNums');
...@@ -54,8 +58,62 @@ var monthOption = new Array(); ...@@ -54,8 +58,62 @@ var monthOption = new Array();
dataModelOptions.push(option); dataModelOptions.push(option);
</c:if> </c:if>
</c:forEach> </c:forEach>
$('#modelId').append(dataModelOptions); $('#modelId').append(dataModelOptions);
<c:forEach items="${provinceList}" var="province">
var option = new Option('${province.provinceName}','${province.provinceId}');
provinceOptions.push(option);
</c:forEach>
$('#provinceId').append(provinceOptions);
<c:forEach items="${datasourceList}" var="datasource" varStatus="status">
var option = new Option('${datasource.dataSourceName}','${datasource.dataSourceId}');
datasourceOptions.push(option);
<c:if test ="${status.first}">
<c:forEach items="${channelDataSourceMapList}" var="channelDataSourceMap" >
<c:if test ="${channelDataSourceMap.dataSourceId == datasource.dataSourceId}">
var channelName = "";
<c:forEach items="${channelList}" var="channel" varStatus="channelStatus">
<c:if test="${channel.channelId == channelDataSourceMap.channelId}" >
channelName='${channel.channelName}';
</c:if>
</c:forEach>
var channelOption = new Option(channelName,'${channelDataSourceMap.channelId}');
channelOptions.push(channelOption);
</c:if>
</c:forEach>
</c:if>
</c:forEach>
$('#datasourceViewId').append(datasourceOptions);
$('#channelId').append(channelOptions);
function changeBusinessData(){
$('#businessId').empty();
businessOptions=[];
<c:forEach items="${channelDataSourceMapList}" var="channelDataSourceMap">
if('${channelDataSourceMap.channelId}' == $("#channelId").val() && '${channelDataSourceMap.dataSourceId}' == $("#datasourceViewId").val()){
<c:forEach items="${businessList}" var="business">
<c:if test="${business.channelDataSourceMapId == channelDataSourceMap.channelDataSourceMapId}">
var option = new Option('${business.businessName}','${business.businessId}');
businessOptions.push(option);
</c:if>
</c:forEach>
}
</c:forEach>
$('#businessId').append(businessOptions);
}
changeBusinessData();
<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>";
$('#addTr').append(tr);
</c:forEach>
changeTaskType(); changeTaskType();
$('#modelId').val('${runTask.dataModelView.dataModelId}'); $('#modelId').val('${runTask.dataModelView.dataModelId}');
$('#detailSelect').val('${runTask.taskDetail.taskInfoId}'); $('#detailSelect').val('${runTask.taskDetail.taskInfoId}');
...@@ -83,12 +141,59 @@ var monthOption = new Array(); ...@@ -83,12 +141,59 @@ var monthOption = new Array();
if($('#frequencyValueHidden').val()) { if($('#frequencyValueHidden').val()) {
$('#frequencyValue').val($('#frequencyValueHidden').val()); $('#frequencyValue').val($('#frequencyValueHidden').val());
} }
$('#modelId').change(function(){
var modelId = $('#modelId').val();
$.ajax({
type : 'GET',
contentType : 'application/json',
url: "${ctx}/BaseManage/TaskManage/getModelParameterList?modelId="+modelId,
dataType : 'text',
beforeSend: function(data) {},
success: function(data) {
$('#addTr').empty();
data = JSON.parse(data)
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>";
$('#addTr').append(tr);
})
}
});
});
$('#datasourceViewId').change(function(){
$("#channelId").empty();
channelOptions =[];
<c:forEach items="${channelDataSourceMapList}" var="channelDataSourceMap" >
if('${channelDataSourceMap.dataSourceId}'==$("#datasourceViewId").val()){
var channelName = "";
<c:forEach items="${channelList}" var="channel" varStatus="channelStatus">
<c:if test="${channel.channelId == channelDataSourceMap.channelId}" >
channelName='${channel.channelName}';
</c:if>
</c:forEach>
var channelOption = new Option(channelName,'${channelDataSourceMap.channelId}');
channelOptions.push(channelOption);
}
</c:forEach>
$('#channelId').append(channelOptions);
changeBusinessData();
});
$('#channelId').change(function(){
changeBusinessData();
})
}); });
function changeInputStatus(eleId, objId) { function changeInputStatus(eleId, objId) {
$('#' + objId).attr('disabled', !$('#' + eleId).attr('checked')); $('#' + objId).attr('disabled', !$('#' + eleId).attr('checked'));
} }
function submitForm() { function submitForm() {
var url = '${ctx}/BaseManage/TaskManage/checkNameAndCode'; var url = '${ctx}/BaseManage/TaskManage/checkNameAndCode';
var data = 'name=' + $('#name').val() + "&code=" + $('#code').val() + "&id=" + $('#taskId').val() + "&defaultTaskType=" + $('#defaultTaskType').val() ; var data = 'name=' + $('#name').val() + "&code=" + $('#code').val() + "&id=" + $('#taskId').val() + "&defaultTaskType=" + $('#defaultTaskType').val() ;
...@@ -97,7 +202,37 @@ var monthOption = new Array(); ...@@ -97,7 +202,37 @@ var monthOption = new Array();
$('#frequency').focus(); $('#frequency').focus();
return; return;
} */ } */
checkAndSubmit(url, encodeURI(encodeURI(data))); if (validate()) {
var i = $("#addTr").find("tr").size();
if(i==0){
checkAndSubmit(url, encodeURI(encodeURI(data)));
}else {
$("#addTr").find("tr").each(function () {
//alert($(this).find("td").eq(0).html());
var modelId = $('#modelId').val();
var paramName = $(this).find("td").eq(0).html();
var paramValue = $(this).find("td").eq(1).find("input").val();
var paramType = $(this).find("td").eq(2).html();
var taskId = $('#taskId').val();
console.log(paramValue)
$.ajax({
type: "GET",
contentType: "application/json",
url: "${ctx}/BaseManage/TaskManage/createModelParam?modelId="+encodeURIComponent(modelId)+"&paramName=" + encodeURIComponent(paramName) + "&paramValue=" + encodeURIComponent(paramValue) + "&paramType=" + encodeURIComponent(paramType) + "&taskId=" + encodeURIComponent(taskId),
dataType: "text",
async: false,
beforeSend: function (data) {
},
success: function () {
i--;
if (i == 0) {
checkAndSubmit(url, encodeURI(encodeURI(data)));
}
}
});
});
}
}
} }
function checkFrequency() { function checkFrequency() {
...@@ -184,8 +319,8 @@ var monthOption = new Array(); ...@@ -184,8 +319,8 @@ var monthOption = new Array();
} }
function showDetail() { function showDetail() {
$('#detailLabel').removeClass("hidden");
$('#detailDiv').removeClass("hidden"); $('#detailDiv').removeClass("hidden");
$('#detailLabel').removeClass("hidden");
$('#modelLabel').addClass("hidden"); $('#modelLabel').addClass("hidden");
$('#modelDiv').addClass("hidden"); $('#modelDiv').addClass("hidden");
...@@ -233,6 +368,20 @@ var monthOption = new Array(); ...@@ -233,6 +368,20 @@ var monthOption = new Array();
$('#frequencyValue').append(monthOption); $('#frequencyValue').append(monthOption);
} }
} }
function abandonTask(){
$.ajax({
type: "GET",
contentType: "application/json",
url: "${ctx}/BaseManage/TaskManage/taskDeleteFrame?taskId="+$('#taskId').val(),
dataType: "text",
async: false,
beforeSend: function (data) {
},
success: function () {
window.location.href='${ctx}/BaseManage/TaskManage/taskListFrame?defaultTaskType=${runTask.defaultTaskType}'
}
});
}
</script> </script>
</head> </head>
<body> <body>
...@@ -269,7 +418,39 @@ var monthOption = new Array(); ...@@ -269,7 +418,39 @@ var monthOption = 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>
<tr>
<td id="provinceLabel">省份：</td>
<td id="provinceDiv">
<select class="form-control input-sm" id="provinceId" name="provinceView.provinceId">
</select>
</td>
</tr>
<tr>
<td id="dataSourceLabel">数据来源：</td>
<td id="dataSourceDiv">
<select class="form-control input-sm" id="datasourceViewId" name="dataSource.dataSourceId" >
</select>
</td>
</tr>
<tr>
<td id="channelLabel">渠道：</td>
<td id="channelDiv">
<select class="form-control input-sm" id="channelId" >
</select>
</td>
</tr>
<tr>
<td id="businessLabel">业务：</td>
<td id="businessDiv">
<select class="form-control input-sm" id="businessId" >
</select>
</td>
</tr>
<tr> <tr>
<td>任务组：</td> <td>任务组：</td>
<td> <td>
...@@ -345,7 +526,6 @@ var monthOption = new Array(); ...@@ -345,7 +526,6 @@ var monthOption = new Array();
</select> </select>
</td> </td>
</tr> </tr>
<tr id="detailRow"> <tr id="detailRow">
<td id="detailLabel">数据维护任务信息：</td> <td id="detailLabel">数据维护任务信息：</td>
<td id="detailDiv"> <td id="detailDiv">
...@@ -353,7 +533,6 @@ var monthOption = new Array(); ...@@ -353,7 +533,6 @@ var monthOption = new Array();
</select> </select>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>下次运行时间（<font color="red">必填</font>）：</td> <td>下次运行时间（<font color="red">必填</font>）：</td>
<td> <td>
...@@ -379,17 +558,18 @@ var monthOption = new Array(); ...@@ -379,17 +558,18 @@ var monthOption = new Array();
</tr> </tr>
</c:if> </c:if>
<tr> <tr>
<td>任务内容：</td> <td>模型参数：</td>
<td> <td>
<c:if test="${runTask.defaultTaskType == 1 }"> <div style="width:420px;height: 130px;overflow: auto">
<textarea class="form-control input-sm" rows="6" maxlength="666" disabled>r_model_task_agent.pl</textarea> <table class="table table-hover table-striped" id="displayParam" >
<input type="hidden" name="taskContext" value="r_model_task_agent.pl"> <thead>
</c:if> <tr><th>参数名</th><th>参数值</th><th>参数类型</th></tr>
</thead>
<c:if test="${runTask.defaultTaskType != 1 }"> <tbody id="addTr">
<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}"> </tbody>
</c:if> </table>
</div>
</td> </td>
</tr> </tr>
<c:if test="${runTask.defaultTaskType != 3 }"> <c:if test="${runTask.defaultTaskType != 3 }">
...@@ -405,7 +585,7 @@ var monthOption = new Array(); ...@@ -405,7 +585,7 @@ var monthOption = 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="window.location.href='${ctx}/BaseManage/TaskManage/taskListFrame?defaultTaskType=${runTask.defaultTaskType}'">返回</button> <button type="reset" class="btn btn-warning" id="modelBack" onclick="abandonTask()">返回</button>
</td> </td>
</tr> </tr>
</table> </table>
......
src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp
View file @ 1f031902
...@@ -121,30 +121,7 @@ taskName = "自定义任务"; ...@@ -121,30 +121,7 @@ taskName = "自定义任务";
cancelValue:"取消", cancelValue:"取消",
lock:true lock:true
}); });
/* $('#newTaskStatus').val(status);
$('#targetTaskId').val(id);
$('#queryForm').submit();
$.ajax({
type : 'post',
'url' : '${ctx}/BaseManage/TaskManage/queryResultFrame',
data : $('#queryForm').serialize() + "&page=" + page,
success : function(data) {
alert("操作成功")
}
}); */
} }
/* function updateStatus(status, id) {
$.ajax({
type : 'post',
'url' : '${ctx}/BaseManage/TaskManage/updateStatusFrame',
data : "newTaskStatus=" + status + "&taskId=" +id,
success : function(data) {
queryResult($('#currentPage').val);
}
});
} */
function queryResult(page) { function queryResult(page) {
$.ajax({ $.ajax({
...@@ -157,6 +134,11 @@ taskName = "自定义任务"; ...@@ -157,6 +134,11 @@ taskName = "自定义任务";
} }
}); });
} }
function preview(){
var id = $('input[name="taskId"]:checked').val();
parent.preview();
}
$(document).ready(function(){ $(document).ready(function(){
queryResult(1); queryResult(1);
...@@ -267,5 +249,6 @@ taskName = "自定义任务"; ...@@ -267,5 +249,6 @@ taskName = "自定义任务";
</div> </div>
</div> </div>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp
View file @ 1f031902
...@@ -12,9 +12,10 @@ ...@@ -12,9 +12,10 @@
<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" onclick="">模型预览</button> <button class="btn-sm btn btn-primary btn-sm btn-group btn-group-cog" id="ModelPreview" onclick="preview()">模型预览</button>
</div> </div>
</div> </div>
<table class="table table-hover table-striped"> <table class="table table-hover table-striped">
<thead> <thead>
<tr> <tr>
...@@ -39,6 +40,7 @@ ...@@ -39,6 +40,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<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}" /></td>
......
src/main/webapp/WEB-INF/views/TaskManage/TaskHome.jsp
View file @ 1f031902
...@@ -30,6 +30,11 @@ ...@@ -30,6 +30,11 @@
}); });
$("#${selectTab}").click(); $("#${selectTab}").click();
}); });
</script> </script>
</head> </head>
......
src/main/webapp/static/js/validation.js
View file @ 1f031902
...@@ -88,7 +88,7 @@ function checkKpi() { ...@@ -88,7 +88,7 @@ function checkKpi() {
} }
function checkAndSubmit(url, data) { function checkAndSubmit(url, data) {
if (validate()) {
$.ajax({ $.ajax({
type : 'POST', type : 'POST',
url: url, url: url,
...@@ -101,11 +101,11 @@ function checkAndSubmit(url, data) { ...@@ -101,11 +101,11 @@ function checkAndSubmit(url, data) {
alert("代码已存在"); alert("代码已存在");
$('#code').focus(); $('#code').focus();
} else { } else {
$('#detailForm').submit(); $('#detailForm').submit();
} }
} }
}); });
}
} }
function saveForm(id) { function saveForm(id) {
......
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