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

模型预览完成

模型监控增加字段，增加添加修改模型参数
25f2cdf0 · afe · 009b18e1 · 25f2cdf0 · 25f2cdf0 · 25f2cdf0
Commit 25f2cdf0 authored Nov 28, 2017 by afe
42 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 ### Example user template

 # IntelliJ project files
-
+.idea
 *.iml
 out
 gen

--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,13 @@
  <component name="JavaScriptSettings">
    <option name="languageLevel" value="ES5" />
  </component>
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" project-jdk-name="1.6" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/out" />
  </component>

--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,19 +6,58 @@
    </artifacts-to-build>
  </component>
  <component name="ChangeListManager">
-    <list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="">
+    <list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="Merge remote-tracking branch 'monitorAnalysis/liuna'&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ChannelDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/BusinessService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$1.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$2.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$3.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$4.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/EWarningCalcResult.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/commonmanage/APPEWarningDetailDao.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/commonmanage/EWarningCalcResultDao.java" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CmszMonitorAnalysis.war" afterPath="$PROJECT_DIR$/CmszMonitorAnalysis.war" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/Business.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/Business.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/Channel.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/Channel.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/DataSource.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/DataSource.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/InsideXcdWorkingOrderInfo.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/InsideXcdWorkingOrderInfo.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/ModelParameter.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/ModelParameter.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/commonmanage/RunTask.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/commonmanage/RunTask.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/BusinessDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/BusinessDao.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/ChannelDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/ChannelDao.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/KpiDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/KpiDao.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/repository/ModelParameterDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/ModelParameterDao.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/service/BusinessService.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/service/BusinessService.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/PageURLController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/PageURLController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/commonmanage/TaskManageController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/commonmanage/TaskManageController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/modelmanage/ModelMaintainController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/modelmanage/ModelMaintainController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Business.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Business.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Channel.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/Channel.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/DataSource.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/DataSource.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/commonmanage/RunTask.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/commonmanage/RunTask.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ModelParameterDao.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ModelParameterDao.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/commonmanage/TaskManageController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/commonmanage/TaskManageController.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcd.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcd.jsp" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/insideXcdWarningTable.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/insideXcdWarningTable.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/APPEWarningDetail.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/APPEWarningDetail.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Business.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Business.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Channel.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Channel.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataSource.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataSource.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DimKpi.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DimKpi.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/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/java/com/hp/cmsz/repository/DimKpiDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/DimKpiDao.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ModelParameterDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ModelParameterDao.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/DimKpiService.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/DimKpiService.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/error/500.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/error/500.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/validation.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/validation.js" />
    </list>
    <ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
+    <ignored path="$PROJECT_DIR$/target/" />
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
    <option name="TRACKING_ENABLED" value="true" />
    <option name="SHOW_DIALOG" value="false" />
@@ -30,7 +69,58 @@
    <option name="refreshEnabled" value="true" />
  </component>
  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="TaskManageController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="5368">
+              <caret line="275" column="40" lean-forward="false" selection-start-line="275" selection-start-column="33" selection-end-line="275" selection-end-column="40" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="method#submitTaskFrame#0;class#TaskManageController#0" expanded="false" />
+                <element signature="method#taskDeleteFrame#0;class#TaskManageController#0" expanded="false" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ModelParameter.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/ModelParameter.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="330">
+              <caret line="22" column="28" lean-forward="false" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="28" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="RunTaskForm.jsp" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="176">
+              <caret line="138" column="41" lean-forward="true" selection-start-line="138" selection-start-column="41" selection-end-line="138" selection-end-column="41" />
+              <folding>
+                <element signature="n#c:forEach#0;n#jsp:root#0;n#!!top" expanded="false" />
+                <element signature="n#c:forEach#1;n#jsp:root#0;n#!!top" expanded="false" />
+                <element signature="n#c:forEach#2;n#jsp:root#0;n#!!top" expanded="false" />
+                <element signature="n#c:forEach#3;n#jsp:root#0;n#!!top" expanded="false" />
+                <element signature="n#c:forEach#7;n#jsp:root#0;n#!!top" expanded="false" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="validation.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/validation.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="2464">
+              <caret line="112" column="18" lean-forward="false" selection-start-line="112" selection-start-column="11" selection-end-line="112" selection-end-column="18" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
  </component>
  <component name="FileTemplateManagerImpl">
    <option name="RECENT_TEMPLATES">
@@ -43,36 +133,36 @@
  </component>
  <component name="FindInProjectRecents">
    <findStrings>
-      <find>k==7</find>
-      <find>create</find>
-      <find>xcdWarningInfoViewService</find>
-      <find>glyphicon-class</find>
-      <find>style</find>
-      <find>exportWord</find>
-      <find>createForm</find>
-      <find>upload</find>
-      <find>window.open</find>
-      <find>header[7]</find>
-      <find>console.log</find>
-      <find>==</find>
-      <find>viewAction</find>
-      <find>pentaho/view</find>
-      <find>biserver_config</find>
-      <find>initDate</find>
-      <find>/home/hg</find>
-      <find>新建</find>
-      <find>GJFX_warni</find>
-      <find>XcdChangeOrderDao</find>
-      <find>XcdChangeOrderService</find>
-      <find>createInsideWorkingOrder</find>
-      <find>内部</find>
-      <find>updateRelXcdIdByWarningId</find>
-      <find>warningId</find>
-      <find>下发协查单</find>
-      <find>returninfo</find>
-      <find>getUrlParams</find>
-      <find>green-tr</find>
-      <find>update</find>
+      <find>taskId</find>
+      <find>kpiId</find>
+      <find>provinceId</find>
+      <find>provinceView</find>
+      <find>channelStatus</find>
+      <find>DimKpiView</find>
+      <find>preview</find>
+      <find>getModelParameterList</find>
+      <find>queryResultFrame</find>
+      <find>location</find>
+      <find>rserv</find>
+      <find>RC</find>
+      <find>perl</find>
+      <find>RConnection</find>
+      <find>for</find>
+      <find>taskContext</find>
+      <find>format</find>
+      <find>forma</find>
+      <find>ewarning</find>
+      <find>taskFormFrame</find>
+      <find>taskDeleteFrame</find>
+      <find>dialog</find>
+      <find>taskListFrame</find>
+      <find>FXJM_DATA_MODEL_INFO_T</find>
+      <find>run_task_t</find>
+      <find>.APP_EWARNING_CALC_RESULT_T</find>
+      <find>dataModelParameterList</find>
+      <find>\n</find>
+      <find>submitForm</find>
+      <find>addTr</find>
    </findStrings>
    <replaceStrings>
      <replace>InsideXcdWorkingOrderInfoView</replace>
@@ -95,23 +185,6 @@
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <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" />
@@ -125,7 +198,6 @@
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoView.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.java" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/docx4j-3.1.0.jar!/org/docx4j/openpackaging/packages/OpcPackage.class" />
-        <option value="$PROJECT_DIR$/.gitignore" />
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderCreate.jsp" />
        <option value="$PROJECT_DIR$/src/main/webapp/static/js/modelResultDetailTable.js" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoViewService.java" />
@@ -140,6 +212,30 @@
        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag" />
        <option value="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" />
        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java" />
+        <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DimKpi.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/DimKpiDao.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/DimKpiService.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar!/javax/persistence/JoinColumn.class" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar!/javax/persistence/ManyToOne.class" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/commonmanage/APPEWarningDetailDao.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/error/500.jsp" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/Task.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Channel.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataSource.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Business.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ModelParameterDao.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/APPEWarningDetail.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/EWarningCalcResult.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/commonmanage/EWarningCalcResultDao.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp" />
+        <option value="$PROJECT_DIR$/src/main/webapp/static/js/validation.js" />
+        <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java" />
+        <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp" />
      </list>
    </option>
  </component>
@@ -165,7 +261,21 @@
  </component>
  <component name="MavenProjectNavigator">
    <treeState>
-      <expand />
+      <expand>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="Profiles" type="6783ec58:MavenProjectsStructure$ProfilesNode" />
+        </path>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="CmszMonitorAnalysis" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+        </path>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="CmszMonitorAnalysis" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+          <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
+        </path>
+      </expand>
      <select />
    </treeState>
  </component>
@@ -192,7 +302,6 @@
    </navigator>
    <panes>
      <pane id="AndroidView" />
-      <pane id="Scope" />
      <pane id="Scratches" />
      <pane id="ProjectPane">
        <subPane>
@@ -204,12 +313,43 @@
            <path>
              <item name="trunk" type="b2602c69:ProjectViewProjectNode" />
              <item name="trunk" type="462c0819:PsiDirectoryNode" />
-              <item name="数据库脚本" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="trunk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="trunk" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="trunk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="trunk" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="trunk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="trunk" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="trunk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="trunk" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="cmsz" type="462c0819:PsiDirectoryNode" />
            </path>
          </expand>
          <select />
        </subPane>
      </pane>
+      <pane id="Scope" />
      <pane id="PackagesPane" />
    </panes>
  </component>
@@ -219,8 +359,8 @@
    <property name="project.structure.last.edited" value="Artifacts" />
    <property name="project.structure.proportion" value="0.15" />
    <property name="project.structure.side.proportion" value="0.2" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../大屏前台/http" />
-    <property name="settings.editor.selected.configurable" value="Settings.JavaScript" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="settings.editor.selected.configurable" value="preferences.externalDependencies" />
    <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="jsx.switch.disabled" value="true" />
@@ -457,6 +597,15 @@
      <workItem from="1510044948539" duration="32189000" />
      <workItem from="1510981253246" duration="11664000" />
      <workItem from="1511142387727" duration="53000" />
+      <workItem from="1511513928497" duration="44022000" />
+      <workItem from="1511669191946" duration="5984000" />
+      <workItem from="1511746960590" duration="3338000" />
+      <workItem from="1511752842702" duration="2067000" />
+      <workItem from="1511765970234" duration="2783000" />
+      <workItem from="1511769485821" duration="12663000" />
+      <workItem from="1511782876195" duration="4401000" />
+      <workItem from="1511839089264" duration="2725000" />
+      <workItem from="1511851026158" duration="149000" />
    </task>
    <task id="LOCAL-00001" summary="first commit">
      <created>1507828551888</created>
@@ -528,50 +677,102 @@
      <option name="project" value="LOCAL" />
      <updated>1510162965813</updated>
    </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="Merge remote-tracking branch 'monitorAnalysis/liuna'&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ChannelDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/BusinessService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$1.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$2.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$3.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$4.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class">
+      <created>1511514153214</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1511514153214</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="213873000" />
+    <option name="totallyTimeSpent" value="292005000" />
+  </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
  </component>
  <component 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>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.58388156" sideWeight="0.5060606" order="8" side_tool="true" content_ui="tabs" />
-      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IvyIDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="IvyIDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39901477" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39802632" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32837838" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3972973" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="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="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27467105" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.66611844" sideWeight="0.4939394" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2377892" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
      <window_info id="SVN Repositories" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
      <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="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3223684" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32072368" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
    </layout>
+    <layout-to-restore>
+      <window_info id="SVN Repositories" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.58388156" sideWeight="0.5060606" order="8" side_tool="true" content_ui="tabs" />
+      <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="IvyIDEA" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39802632" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32837838" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32072368" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27467105" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.7582237" sideWeight="0.4939394" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32730263" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
+    </layout-to-restore>
  </component>
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="1" />
@@ -626,7 +827,9 @@
    <MESSAGE value="2017年11月08 智能分析平台提交内容&#10;    --模型页面" />
    <MESSAGE value="2017年11月09 智能分析平台提交内容&#10;      --模型管理增加字段&#10;      --告警监控-内部协查单功能&#10;      --验收通过" />
    <MESSAGE value="2017年11月09 智能分析平台提交内容&#10;      --数据库脚本更新" />
-    <option name="LAST_COMMIT_MESSAGE" value="2017年11月09 智能分析平台提交内容&#10;      --数据库脚本更新" />
+    <MESSAGE value="Merge remote-tracking branch 'monitorAnalysis/liuna'&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ChannelDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/BusinessService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$1.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$2.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$3.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$4.class&#10;#&#9;src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class" />
+    <MESSAGE value="模型监控增加字段，增加添加修改模型参数&#10;模型预览完成" />
+    <option name="LAST_COMMIT_MESSAGE" value="模型监控增加字段，增加添加修改模型参数&#10;模型预览完成" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
@@ -655,376 +858,413 @@
    </buildFile>
  </component>
  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/FXJM_modelResult_DataModelTypeTag.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdChangeView.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="436">
-          <caret line="90" column="13" lean-forward="false" selection-start-line="90" selection-start-column="13" selection-end-line="90" selection-end-column="13" />
+        <state relative-caret-position="238">
+          <caret line="34" column="53" lean-forward="true" selection-start-line="33" selection-start-column="3" selection-end-line="34" selection-end-column="53" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdWorkingOrderInfoDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/commonmanage/BaseDataDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="260">
-          <caret line="78" column="12" lean-forward="true" selection-start-line="78" selection-start-column="12" selection-end-line="78" selection-end-column="12" />
+        <state relative-caret-position="220">
+          <caret line="13" column="115" lean-forward="false" selection-start-line="13" selection-start-column="29" selection-end-line="13" selection-end-column="115" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/JCS_datasource_channle.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/artDialog4.1.7/_doc/highlight/readme.eng.txt">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="194">
+          <caret line="131" column="0" lean-forward="false" selection-start-line="131" selection-start-column="0" selection-end-line="131" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningSource.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WarnAnalysisController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="132">
-          <caret line="9" column="51" lean-forward="false" selection-start-line="9" selection-start-column="51" selection-end-line="9" selection-end-column="51" />
+        <state relative-caret-position="194">
+          <caret line="86" column="13" lean-forward="false" selection-start-line="86" selection-start-column="13" selection-end-line="86" selection-end-column="13" />
        </state>
      </provider>
    </entry>
-    <entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/spring-data-commons-1.5.1.RELEASE.jar!/org/springframework/data/repository/CrudRepository.class">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="16" column="26" lean-forward="false" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
+        <state relative-caret-position="-5726">
+          <caret line="83" column="13" lean-forward="false" selection-start-line="83" selection-start-column="13" selection-end-line="83" selection-end-column="13" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_FocusDataDao.java">
+    <entry file="jar://$PROJECT_DIR$/../../jdk1.6.0_18/jre/lib/rt.jar!/java/lang/ClassLoader.class">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="13" column="71" lean-forward="true" selection-start-line="13" selection-start-column="54" selection-end-line="13" selection-end-column="71" />
+        <state relative-caret-position="113">
+          <caret line="122" column="38" lean-forward="false" selection-start-line="122" selection-start-column="38" selection-end-line="122" selection-end-column="38" />
        </state>
      </provider>
    </entry>
-    <entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/spring-data-commons-1.5.1.RELEASE.jar!/org/springframework/data/repository/PagingAndSortingRepository.class">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/commons/utils/PropertiesUtil.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="10" column="44" lean-forward="false" selection-start-line="10" selection-start-column="44" selection-end-line="10" selection-end-column="44" />
+        <state relative-caret-position="223">
+          <caret line="18" column="35" lean-forward="false" selection-start-line="18" selection-start-column="35" selection-end-line="18" selection-end-column="35" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoView.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/commons/utils/CommonUtil.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="16" column="36" lean-forward="false" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="36" />
+        <state relative-caret-position="135">
+          <caret line="251" column="60" lean-forward="true" selection-start-line="251" selection-start-column="60" selection-end-line="251" selection-end-column="60" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/TSWBAnalysisService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderDetailController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="50" column="41" lean-forward="true" selection-start-line="50" selection-start-column="41" selection-end-line="50" selection-end-column="41" />
+        <state relative-caret-position="-1207">
+          <caret line="207" column="49" lean-forward="false" selection-start-line="207" selection-start-column="49" selection-end-line="207" selection-end-column="49" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/TSWBAnalysisController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/failureAnalysisDetailTable.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
-          <caret line="92" column="97" lean-forward="false" selection-start-line="92" selection-start-column="86" selection-end-line="92" selection-end-column="97" />
+        <state relative-caret-position="352">
+          <caret line="16" column="35" lean-forward="false" selection-start-line="16" selection-start-column="35" selection-end-line="16" selection-end-column="35" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderDetail.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelResultController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-66">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="252">
+          <caret line="336" column="30" lean-forward="true" selection-start-line="336" selection-start-column="30" selection-end-line="336" selection-end-column="30" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdWarningInfoViewDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderDetail.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="41" column="47" lean-forward="false" selection-start-line="41" selection-start-column="30" selection-end-line="41" selection-end-column="47" />
+        <state relative-caret-position="238">
+          <caret line="818" column="36" lean-forward="false" selection-start-line="818" selection-start-column="36" selection-end-line="818" selection-end-column="36" />
        </state>
      </provider>
    </entry>
-    <entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/docx4j-3.1.0.jar!/org/docx4j/openpackaging/packages/OpcPackage.class">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WarnAnalysisDetail.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="76" column="16" lean-forward="false" selection-start-line="76" selection-start-column="16" selection-end-line="76" selection-end-column="16" />
+        <state relative-caret-position="-375">
+          <caret line="280" column="1045" lean-forward="true" selection-start-line="280" selection-start-column="1045" selection-end-line="280" selection-end-column="1045" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/commons/utils/ExportWordUtil.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/xcdChangeTable.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="190" column="29" lean-forward="false" selection-start-line="190" selection-start-column="29" selection-end-line="190" selection-end-column="29" />
+        <state relative-caret-position="440">
+          <caret line="26" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/modelResultDetailTable.js">
      <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="238">
+          <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/modelResultDetailTable.js">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="351">
-          <caret line="322" column="60" lean-forward="true" selection-start-line="322" selection-start-column="60" selection-end-line="322" selection-end-column="60" />
+        <state relative-caret-position="-4506">
+          <caret line="124" column="0" lean-forward="false" selection-start-line="124" selection-start-column="0" selection-end-line="125" selection-end-column="40" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/default.jsp">
+    <entry file="jar://$APPLICATION_HOME_DIR$/lib/idea.jar!/resources/html5-schema/html5/web-forms.rnc">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-182">
-          <caret line="21" column="8" lean-forward="false" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
+        <state relative-caret-position="194">
+          <caret line="503" column="16" lean-forward="false" selection-start-line="503" selection-start-column="16" selection-end-line="503" selection-end-column="16" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoViewDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="478">
-          <caret line="28" column="0" lean-forward="true" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
+        <state relative-caret-position="22">
+          <caret line="1177" column="0" lean-forward="false" selection-start-line="1177" selection-start-column="0" selection-end-line="1177" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/PeriodTag.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/artDialog4.1.7/jquery.artDialog.source.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="100" column="17" lean-forward="false" selection-start-line="100" selection-start-column="9" selection-end-line="100" selection-end-column="17" />
+        <state relative-caret-position="260">
+          <caret line="878" column="0" lean-forward="false" selection-start-line="878" selection-start-column="0" selection-end-line="878" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/build.xml">
+    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/lib/JavaScriptLanguage.jar!/com/intellij/lang/javascript/index/predefined/DHTML.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="33" column="32" lean-forward="true" selection-start-line="33" selection-start-column="32" selection-end-line="33" selection-end-column="32" />
-          <folding />
+        <state relative-caret-position="194">
+          <caret line="1382" column="0" lean-forward="false" selection-start-line="1382" selection-start-column="0" selection-end-line="1382" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/lib/JavaScriptLanguage.jar!/com/intellij/lang/javascript/index/predefined/EcmaScript.js">
+    <entry file="jar://$PROJECT_DIR$/../../jdk1.6.0_18/jre/lib/rt.jar!/java/lang/Throwable.class">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="146">
-          <caret line="45" column="18" lean-forward="false" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="18" />
+        <state relative-caret-position="110">
+          <caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoViewService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="158">
-          <caret line="19" column="47" lean-forward="false" selection-start-line="19" selection-start-column="47" selection-end-line="19" selection-end-column="47" />
+        <state relative-caret-position="4004">
+          <caret line="182" column="4" lean-forward="false" selection-start-line="182" selection-start-column="4" selection-end-line="182" selection-end-column="4" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/error/500.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="83" column="145" lean-forward="false" selection-start-line="83" selection-start-column="143" selection-end-line="83" selection-end-column="145" />
+        <state relative-caret-position="220">
+          <caret line="10" column="14" lean-forward="false" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/数据库脚本/201710/view.sql">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataModel.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="5" column="36" lean-forward="true" selection-start-line="5" selection-start-column="36" selection-end-line="5" selection-end-column="36" />
+        <state relative-caret-position="264">
+          <caret line="20" column="15" lean-forward="false" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderDetailController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1720">
-          <caret line="64" column="13" lean-forward="false" selection-start-line="64" selection-start-column="13" selection-end-line="64" selection-end-column="13" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#submitTaskFrame#0;class#TaskManageController#0" expanded="false" />
+            <element signature="method#taskDeleteFrame#0;class#TaskManageController#0" expanded="false" />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdWarningInfoView.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/RunTaskDetail.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="39" />
+        <state relative-caret-position="129">
+          <caret line="24" column="13" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/TaskType.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="37" column="32" lean-forward="false" selection-start-line="37" selection-start-column="32" selection-end-line="37" selection-end-column="32" />
+        <state relative-caret-position="132">
+          <caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdChangeOrder.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/commonmanage/RunTaskService.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+        <state relative-caret-position="-66">
+          <caret line="134" column="29" lean-forward="false" selection-start-line="134" selection-start-column="19" selection-end-line="134" selection-end-column="29" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WarnAnalysisDetailController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskDetailManageController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2112">
-          <caret line="79" column="41" lean-forward="false" selection-start-line="79" selection-start-column="13" selection-end-line="79" selection-end-column="41" />
+        <state relative-caret-position="242">
+          <caret line="11" column="41" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="53" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdChangeOrderDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/commons/filter/SSOFilter.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="18" column="34" lean-forward="false" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="34" />
+        <state relative-caret-position="308">
+          <caret line="38" column="47" lean-forward="false" selection-start-line="38" selection-start-column="47" selection-end-line="38" selection-end-column="47" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Channel.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        <state relative-caret-position="282">
+          <caret line="32" column="0" lean-forward="false" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Business.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="8" column="90" lean-forward="false" selection-start-line="8" selection-start-column="90" selection-end-line="8" selection-end-column="90" />
+        <state relative-caret-position="84">
+          <caret line="15" column="19" lean-forward="false" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdChangeOrderService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataSource.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-248">
-          <caret line="23" column="34" lean-forward="false" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="34" />
+        <state relative-caret-position="392">
+          <caret line="31" column="0" lean-forward="false" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="49" column="33" lean-forward="true" selection-start-line="49" selection-start-column="33" selection-end-line="49" selection-end-column="33" />
+        <state relative-caret-position="198">
+          <caret line="15" column="117" lean-forward="false" selection-start-line="15" selection-start-column="117" selection-end-line="15" selection-end-column="117" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderCreate.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="307">
-          <caret line="323" column="87" lean-forward="false" selection-start-line="323" selection-start-column="69" selection-end-line="323" selection-end-column="87" />
+        <state relative-caret-position="406">
+          <caret line="146" column="11" lean-forward="false" selection-start-line="146" selection-start-column="11" selection-end-line="146" selection-end-column="11" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/insideXcdWarningTable.js">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ModelParameterDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="412">
-          <caret line="586" column="11" lean-forward="true" selection-start-line="586" selection-start-column="11" selection-end-line="586" selection-end-column="11" />
+        <state relative-caret-position="236">
+          <caret line="37" column="55" lean-forward="false" selection-start-line="37" selection-start-column="25" selection-end-line="37" selection-end-column="55" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/GjfxRelatedInsideWorkingOrder.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/EWarningDropRule.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="116">
-          <caret line="33" column="16" lean-forward="false" selection-start-line="33" selection-start-column="16" selection-end-line="33" selection-end-column="16" />
+        <state relative-caret-position="330">
+          <caret line="25" column="39" lean-forward="true" selection-start-line="18" selection-start-column="4" selection-end-line="25" selection-end-column="39" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/FailureAttachment.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-532">
-          <caret line="83" column="13" lean-forward="false" selection-start-line="83" selection-start-column="13" selection-end-line="83" selection-end-column="13" />
+        <state relative-caret-position="194">
+          <caret line="18" column="13" lean-forward="false" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="9" column="114" lean-forward="false" selection-start-line="9" selection-start-column="85" selection-end-line="9" selection-end-column="114" />
+        <state relative-caret-position="-66">
+          <caret line="24" column="13" lean-forward="false" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/AppData.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1826">
-          <caret line="118" column="41" lean-forward="false" selection-start-line="118" selection-start-column="30" selection-end-line="118" selection-end-column="41" />
+        <state relative-caret-position="194">
+          <caret line="17" column="13" lean-forward="false" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderReasult.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/commonmanage/APPEWarningDetailDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="88">
+          <caret line="6" column="79" lean-forward="false" selection-start-line="6" selection-start-column="79" selection-end-line="6" selection-end-column="79" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningStatus.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/commonmanage/DataBackupDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="242">
+          <caret line="14" column="44" lean-forward="true" selection-start-line="13" selection-start-column="31" selection-end-line="14" selection-end-column="44" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/EWarningCalcResult.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="334" column="62" lean-forward="true" selection-start-line="334" selection-start-column="62" selection-end-line="334" selection-end-column="62" />
+        <state relative-caret-position="418">
+          <caret line="38" column="18" lean-forward="false" selection-start-line="38" selection-start-column="18" selection-end-line="38" selection-end-column="18" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/GjfxWarningInfo.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/APPEWarningDetail.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
-          <caret line="22" column="34" lean-forward="false" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="34" />
+        <state relative-caret-position="250">
+          <caret line="137" column="27" lean-forward="true" selection-start-line="137" selection-start-column="27" selection-end-line="137" selection-end-column="27" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxWarningInfoDao.java">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="164">
-          <caret line="31" column="60" lean-forward="false" selection-start-line="31" selection-start-column="47" selection-end-line="31" selection-end-column="60" />
+        <state relative-caret-position="-13">
+          <caret line="83" column="19" lean-forward="false" selection-start-line="83" selection-start-column="14" selection-end-line="83" selection-end-column="19" />
+          <folding>
+            <marker date="1511832638212" expanded="true" signature="2688:2744" ph="..." />
+            <marker date="1511832638212" expanded="true" signature="2972:2983" ph="..." />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/commonmanage/EWarningCalcResultDao.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="22" column="20" lean-forward="true" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" />
+        <state relative-caret-position="154">
+          <caret line="11" column="55" lean-forward="false" selection-start-line="11" selection-start-column="33" selection-end-line="11" selection-end-column="55" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp">
+    <entry file="jar://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/lib/JavaScriptLanguage.jar!/com/intellij/lang/javascript/index/predefined/EcmaScript.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="93">
-          <caret line="25" column="4" lean-forward="true" selection-start-line="25" selection-start-column="4" selection-end-line="25" selection-end-column="4" />
+        <state relative-caret-position="194">
+          <caret line="55" column="0" lean-forward="false" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcd.jsp">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/validation.js">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="8">
-          <caret line="286" column="48" lean-forward="false" selection-start-line="286" selection-start-column="48" selection-end-line="286" selection-end-column="48" />
+        <state relative-caret-position="2464">
+          <caret line="112" column="18" lean-forward="false" selection-start-line="112" selection-start-column="11" selection-end-line="112" selection-end-column="18" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java">
      <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="5368">
+          <caret line="275" column="40" lean-forward="false" selection-start-line="275" selection-start-column="33" selection-end-line="275" selection-end-column="40" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#submitTaskFrame#0;class#TaskManageController#0" expanded="false" />
+            <element signature="method#taskDeleteFrame#0;class#TaskManageController#0" expanded="false" />
+          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/GjfxWarningInfoService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/ModelParameter.java">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="208">
-          <caret line="28" column="39" lean-forward="false" selection-start-line="28" selection-start-column="39" selection-end-line="28" selection-end-column="39" />
+        <state relative-caret-position="330">
+          <caret line="22" column="28" lean-forward="false" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="28" />
+          <folding />
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/static/css/styles.css">
+    <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="22">
-          <caret line="854" column="16" lean-forward="false" selection-start-line="854" selection-start-column="7" selection-end-line="854" selection-end-column="16" />
-          <folding />
+        <state relative-caret-position="176">
+          <caret line="138" column="41" lean-forward="true" selection-start-line="138" selection-start-column="41" selection-end-line="138" selection-end-column="41" />
+          <folding>
+            <element signature="n#c:forEach#0;n#jsp:root#0;n#!!top" expanded="false" />
+            <element signature="n#c:forEach#1;n#jsp:root#0;n#!!top" expanded="false" />
+            <element signature="n#c:forEach#2;n#jsp:root#0;n#!!top" expanded="false" />
+            <element signature="n#c:forEach#3;n#jsp:root#0;n#!!top" expanded="false" />
+            <element signature="n#c:forEach#7;n#jsp:root#0;n#!!top" expanded="false" />
+          </folding>
        </state>
      </provider>
    </entry>
  </component>
  <component name="masterDetails">
    <states>
+      <state key="ArquillianSettingsConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
      <state key="ArtifactsStructureConfigurable.UI">
        <settings>
          <artifact-editor>
            <show-content>
-              <type id="artifact" />
-              <type id="javaee-facet-resources" />
              <type id="library" />
+              <type id="artifact" />
              <type id="jpa-descriptors" />
+              <type id="javaee-facet-resources" />
            </show-content>
          </artifact-editor>
          <last-edited>CmszMonitorAnalysis</last-edited>

--- a/CmszMonitorAnalysis.war
+++ b/CmszMonitorAnalysis.war
--- a/build/com/hp/cmsz/entity/Business.class
+++ b/build/com/hp/cmsz/entity/Business.class
--- a/build/com/hp/cmsz/entity/Channel.class
+++ b/build/com/hp/cmsz/entity/Channel.class
--- a/build/com/hp/cmsz/entity/DataSource.class
+++ b/build/com/hp/cmsz/entity/DataSource.class
--- a/build/com/hp/cmsz/entity/InsideXcdWorkingOrderInfo.class
+++ b/build/com/hp/cmsz/entity/InsideXcdWorkingOrderInfo.class
--- a/build/com/hp/cmsz/entity/ModelParameter.class
+++ b/build/com/hp/cmsz/entity/ModelParameter.class
--- a/build/com/hp/cmsz/entity/commonmanage/RunTask.class
+++ b/build/com/hp/cmsz/entity/commonmanage/RunTask.class
--- a/build/com/hp/cmsz/repository/BusinessDao.class
+++ b/build/com/hp/cmsz/repository/BusinessDao.class
--- a/build/com/hp/cmsz/repository/ChannelDao.class
+++ b/build/com/hp/cmsz/repository/ChannelDao.class
--- a/build/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.class
+++ b/build/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.class
--- a/build/com/hp/cmsz/repository/KpiDao.class
+++ b/build/com/hp/cmsz/repository/KpiDao.class
--- a/build/com/hp/cmsz/repository/ModelParameterDao.class
+++ b/build/com/hp/cmsz/repository/ModelParameterDao.class
--- a/build/com/hp/cmsz/service/BusinessService.class
+++ b/build/com/hp/cmsz/service/BusinessService.class
--- a/build/com/hp/cmsz/web/PageURLController.class
+++ b/build/com/hp/cmsz/web/PageURLController.class
--- a/build/com/hp/cmsz/web/commonmanage/TaskManageController.class
+++ b/build/com/hp/cmsz/web/commonmanage/TaskManageController.class
--- a/build/com/hp/cmsz/web/modelmanage/ModelMaintainController.class
+++ b/build/com/hp/cmsz/web/modelmanage/ModelMaintainController.class
--- a/build/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.class
+++ b/build/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.class
--- a/build/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.class
+++ b/build/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.class
--- a/build/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class
+++ b/build/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class
--- a/src/main/java/com/hp/cmsz/entity/APPEWarningDetail.java
+++ b/src/main/java/com/hp/cmsz/entity/APPEWarningDetail.java
-//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;
-//
-//
-//
-//}
+package com.hp.cmsz.entity;
+
+import com.hp.cmsz.entity.commonmanage.EWarningCalcResult;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+import java.util.List;
+
+@Entity
+@Table(name="Model_Preview_v",schema = "ccolap")
+public class APPEWarningDetail {
+    private Long ewarningDetailId;
+    private String provinceName;
+    private String datasourceName;
+    private String busname;
+    private String channelName;
+    private String kpiName;
+    private String kpiCode;
+    private Timestamp busdatabegTime;
+    private Timestamp busdataendTime;
+
+    private String threshold1Val;
+    private String threshold2Val;
+    private String threshold3Val;
+    private String warn1Val;
+    private String warn2Val;
+    private String warn3Val;
+    private String fileAddress;
+
+    private List<EWarningCalcResult> eWarningCalcResult;
+
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    public Long getEwarningDetailId() {
+        return ewarningDetailId;
+    }
+
+    public void setEwarningDetailId(Long ewarningDetailId) {
+        this.ewarningDetailId = ewarningDetailId;
+    }
+
+    public String getProvinceName() {
+        return provinceName;
+    }
+
+    public void setProvinceName(String provinceName) {
+        this.provinceName = provinceName;
+    }
+
+    public String getDatasourceName() {
+        return datasourceName;
+    }
+
+    public void setDatasourceName(String datasourceName) {
+        this.datasourceName = datasourceName;
+    }
+
+    public String getBusname() {
+        return busname;
+    }
+
+    public void setBusname(String busname) {
+        this.busname = busname;
+    }
+
+    public String getChannelName() {
+        return channelName;
+    }
+
+    public void setChannelName(String channelName) {
+        this.channelName = channelName;
+    }
+
+    public String getKpiName() {
+        return kpiName;
+    }
+
+    public void setKpiName(String kpiName) {
+        this.kpiName = kpiName;
+    }
+
+    public String getKpiCode() {
+        return kpiCode;
+    }
+
+    public void setKpiCode(String kpiCode) {
+        this.kpiCode = kpiCode;
+    }
+
+    public Timestamp getBusdatabegTime() {
+        return busdatabegTime;
+    }
+
+    public void setBusdatabegTime(Timestamp busdatabegTime) {
+        this.busdatabegTime = busdatabegTime;
+    }
+
+    public Timestamp getBusdataendTime() {
+        return busdataendTime;
+    }
+
+    public void setBusdataendTime(Timestamp busdataendTime) {
+        this.busdataendTime = busdataendTime;
+    }
+
+    @Column(name = "threshold1_val")
+    public String getThreshold1Val() {
+        return threshold1Val;
+    }
+
+    public void setThreshold1Val(String threshold1Val) {
+        this.threshold1Val = threshold1Val;
+    }
+
+    @Column(name = "threshold2_val")
+    public String getThreshold2Val() {
+        return threshold2Val;
+    }
+
+    public void setThreshold2Val(String threshold2Val) {
+        this.threshold2Val = threshold2Val;
+    }
+
+    @Column(name = "threshold3_val")
+    public String getThreshold3Val() {
+        return threshold3Val;
+    }
+
+    public void setThreshold3Val(String threshold3Val) {
+        this.threshold3Val = threshold3Val;
+    }
+
+    @Column(name = "warn1_val")
+    public String getWarn1Val() {
+        return warn1Val;
+    }
+
+    public void setWarn1Val(String warn1Val) {
+        this.warn1Val = warn1Val;
+    }
+
+    @Column(name = "warn2_Val")
+    public String getWarn2Val() {
+        return warn2Val;
+    }
+
+    public void setWarn2Val(String warn2Val) {
+        this.warn2Val = warn2Val;
+    }
+
+    @Column(name = "warn3_Val")
+    public String getWarn3Val() {
+        return warn3Val;
+    }
+
+    public void setWarn3Val(String warn3Val) {
+        this.warn3Val = warn3Val;
+    }
+
+    public String getFileAddress() {
+        return fileAddress;
+    }
+
+    public void setFileAddress(String fileAddress) {
+        this.fileAddress = fileAddress;
+    }
+
+    @Transient
+    public List<EWarningCalcResult> geteWarningCalcResult() {
+        return eWarningCalcResult;
+    }
+
+    public void seteWarningCalcResult(List<EWarningCalcResult> eWarningCalcResult) {
+        this.eWarningCalcResult = eWarningCalcResult;
+    }
+}
--- a/src/main/java/com/hp/cmsz/entity/Business.java
+++ b/src/main/java/com/hp/cmsz/entity/Business.java
@@ -34,6 +34,7 @@ public class Business implements Serializable{
 	public Long getBusinessId() {
 		return businessId;
 	}
+
 	public void setBusinessId(Long businessId) {
 		this.businessId = businessId;
 	}

--- a/src/main/java/com/hp/cmsz/entity/Channel.java
+++ b/src/main/java/com/hp/cmsz/entity/Channel.java
@@ -27,13 +27,13 @@ public class Channel implements Serializable{
    @Id
    @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="ChannelSequence")
    @SequenceGenerator(name = "ChannelSequence", sequenceName = "dim_channel_info_t_seq", allocationSize=20)
+	public Long getChannelId() {
+		return channelId;
+	}

 	public String getChannelName() {
 		return channelName;
 	}
-	public Long getChannelId() {
-		return channelId;
-	}
 	public void setChannelId(Long channelId) {
 		this.channelId = channelId;
 	}

--- a/src/main/java/com/hp/cmsz/entity/DataSource.java
+++ b/src/main/java/com/hp/cmsz/entity/DataSource.java
@@ -26,12 +26,14 @@ public class DataSource implements Serializable{
    @Id
    @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="DataSourceSequence")
    @SequenceGenerator(name = "DataSourceSequence", sequenceName = "dim_data_source_info_t_seq", allocationSize=20)
-	public String getDataSourceName() {
-		return dataSourceName;
-	}
 	public Long getDataSourceId() {
 		return dataSourceId;
 	}
+
+	public String getDataSourceName() {
+		return dataSourceName;
+	}
+
 	public void setDataSourceId(Long dataSourceId) {
 		this.dataSourceId = dataSourceId;
 	}

--- a/src/main/java/com/hp/cmsz/entity/DimKpi.java
+++ b/src/main/java/com/hp/cmsz/entity/DimKpi.java
@@ -18,7 +18,7 @@ import javax.persistence.Table;
 */

 @Entity
-@Table(name = "etl.dim_kpi_t")
+@Table(name = "dim_kpi_t",schema = "etl")
 public class DimKpi implements Serializable{

 	/**

--- a/src/main/java/com/hp/cmsz/entity/commonmanage/EWarningCalcResult.java
+++ b/src/main/java/com/hp/cmsz/entity/commonmanage/EWarningCalcResult.java
+package com.hp.cmsz.entity.commonmanage;
+
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+
+@Entity
+@Table(name = "APP_EWARNING_CALC_RESULT_T", schema = "ETL")
+public class EWarningCalcResult {
+
+    private Long	ewarningDataresultId;
+    private Timestamp resultDate;
+
+    private Long dim1Val;
+
+    private Long dim2Val;
+    private Long ewarningDetailId;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "EWarningCalcResultSequence")
+    @SequenceGenerator(name = "EWarningCalcResultSequence", sequenceName = "SEQ_APP_EWARNING_CALC_RESULT", allocationSize = 1)
+    public Long getEwarningDataresultId() {
+        return ewarningDataresultId;
+    }
+
+    public void setEwarningDataresultId(Long ewarningDataresultId) {
+        this.ewarningDataresultId = ewarningDataresultId;
+    }
+
+    public Timestamp getResultDate() {
+        return resultDate;
+    }
+
+    public void setResultDate(Timestamp resultDate) {
+        this.resultDate = resultDate;
+    }
+    @Column(name = "dim1_val")
+    public Long getDim1Val() {
+        return dim1Val;
+    }
+
+    public void setDim1Val(Long dim1Val) {
+        this.dim1Val = dim1Val;
+    }
+    @Column(name = "dim2_val")
+    public Long getDim2Val() {
+        return dim2Val;
+    }
+
+    public void setDim2Val(Long dim2Val) {
+        this.dim2Val = dim2Val;
+    }
+
+    public Long getEwarningDetailId() {
+        return ewarningDetailId;
+    }
+
+    public void setEwarningDetailId(Long ewarningDetailId) {
+        this.ewarningDetailId = ewarningDetailId;
+    }
+}
--- a/src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java
+++ b/src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java
@@ -53,21 +53,21 @@ public class RunTask {
 	@JoinColumn(name = "province_id")
 	private Province provinceView;

-	private Long			kpiId;
-
+	@ManyToOne(fetch = FetchType.EAGER)
+	@JoinColumn(name = "kpi_id")
+	private DimKpi dimKpiView;

+	@ManyToOne(fetch = FetchType.EAGER)
+	@JoinColumn(name = "channel_id")
+	private Channel channelView;

-//	@ManyToOne(fetch = FetchType.EAGER)
-//	@JoinColumn(name = "channel_id")
-//	private Channel channelView;
-//
-//	@ManyToOne(fetch = FetchType.EAGER)
-//	@JoinColumn(name = "dataSource_id")
-//	private DataSource dataSourceView;
+	@ManyToOne(fetch = FetchType.EAGER)
+	@JoinColumn(name = "data_source_id")
+	private DataSource dataSourceView;

-//	@ManyToOne(fetch = FetchType.EAGER)
-//	@JoinColumn(name = "business_id")
-//	private Business businessView;
+	@ManyToOne(fetch = FetchType.EAGER)
+	@JoinColumn(name = "business_id")
+	private Business businessView;


 	@Temporal(TemporalType.TIMESTAMP)
@@ -204,37 +204,38 @@ public class RunTask {
 		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 DimKpi getDimKpiView() {
+		return dimKpiView;
+	}
+
+	public void setDimKpiView(DimKpi dimKpiView) {
+		this.dimKpiView = dimKpiView;
+	}
+
+	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;
 	}

--- a/src/main/java/com/hp/cmsz/repository/DimKpiDao.java
+++ b/src/main/java/com/hp/cmsz/repository/DimKpiDao.java
@@ -11,10 +11,13 @@ import org.springframework.data.repository.query.Param;
 import com.hp.cmsz.entity.DimKpi;

 public interface DimKpiDao extends JpaSpecificationExecutor<DimKpi>,
-PagingAndSortingRepository<DimKpi, Long>{
+		PagingAndSortingRepository<DimKpi, Long>{
+
+	List<DimKpi> findAllByIsActiveAndBusnameId(String active,Long businessId);
+

 	//通过kpiTypeId查找数据采集频率
-	@Query("select dk.calCycle from DimKpi dk where dk.kpiTypeId = ?1")
+	@Query("select dk.calCycle from DimKpi dk where dk.kpiTypeId = :kpiTypeId")
 	List<String> findCayCycleByKpiTypeIdIn(@Param("kpiTypeId")Long kpiTypeId);

 	//通过kpiTypeId修改数据采集频率

--- a/src/main/java/com/hp/cmsz/repository/ModelParameterDao.java
+++ b/src/main/java/com/hp/cmsz/repository/ModelParameterDao.java
@@ -34,6 +34,11 @@ public interface ModelParameterDao extends JpaSpecificationExecutor<ModelParamet
 	//根据数据模型ID查找系统默认的参数d
 	List<ModelParameter> findByDataModelIdAndIfSystemDefault(Long dataModelId, Long ifSystemDefault);

+	//根据任务ID查找系统默认的参数d
+	List<ModelParameter> findByTaskIdAndIfSystemDefault(Long taskId, Long ifSystemDefault);
+
+
+
 	//根据数据模型ID查找参数d
 	List<ModelParameter> findByDataModelIdIn(List<Long> dataModelId);
 	

--- a/src/main/java/com/hp/cmsz/repository/commonmanage/APPEWarningDetailDao.java
+++ b/src/main/java/com/hp/cmsz/repository/commonmanage/APPEWarningDetailDao.java
+package com.hp.cmsz.repository.commonmanage;
+
+import com.hp.cmsz.entity.APPEWarningDetail;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+public interface APPEWarningDetailDao extends PagingAndSortingRepository<APPEWarningDetail,
+        Long>, JpaSpecificationExecutor<APPEWarningDetail> {
+
+    APPEWarningDetail findByEwarningDetailId(Long id);
+
+}
--- a/src/main/java/com/hp/cmsz/repository/commonmanage/EWarningCalcResultDao.java
+++ b/src/main/java/com/hp/cmsz/repository/commonmanage/EWarningCalcResultDao.java
+package com.hp.cmsz.repository.commonmanage;
+
+import com.hp.cmsz.entity.commonmanage.EWarningCalcResult;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import java.util.List;
+
+public interface EWarningCalcResultDao extends PagingAndSortingRepository<EWarningCalcResult, Long>,
+        JpaSpecificationExecutor<EWarningCalcResult> {
+
+        List<EWarningCalcResult> findByEwarningDetailId(Long id);
+
+}
--- a/src/main/java/com/hp/cmsz/service/analysissupport/DimKpiService.java
+++ b/src/main/java/com/hp/cmsz/service/analysissupport/DimKpiService.java
 package com.hp.cmsz.service.analysissupport;

+import com.hp.cmsz.entity.DimKpi;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

 import com.hp.cmsz.repository.DimKpiDao;

+import java.util.List;
+
 @Service
 @Transactional
 public class DimKpiService {
@@ -18,4 +21,9 @@ public class DimKpiService {
 	private void updateByKpiTypeId(String calCycle,Long kpiTypeId){
 		dimKpiDao.updateDimKpiByKpiTypeId(calCycle, kpiTypeId);
 	}
+	//查出active为Y的所以KPI指标
+	public List<DimKpi> findAllByIsActiveAAndBusnameId(Long businessId){
+		return  dimKpiDao.findAllByIsActiveAndBusnameId("Y",businessId);
+	}
+
 }
--- a/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java
+++ b/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java
 package com.hp.cmsz.web.commonmanage;

-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.regexp.RE;
+import com.hp.cmsz.repository.commonmanage.EWarningCalcResultDao;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Controller;
@@ -18,16 +11,23 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;

-import com.hp.cmsz.entity.commonmanage.RunTask;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.util.Arrays;
+import java.util.List;
+
 import com.hp.cmsz.entity.commonmanage.RunTaskDetail;
+import com.hp.cmsz.entity.*;
+import com.hp.cmsz.entity.commonmanage.RunTask;
+import com.hp.cmsz.repository.*;
+import com.hp.cmsz.repository.commonmanage.APPEWarningDetailDao;
 import com.hp.cmsz.service.CmszOperationLogService;
+import com.hp.cmsz.service.analysissupport.DimKpiService;
 import com.hp.cmsz.service.commonmanage.RunTaskService;
 import com.hp.cmsz.service.commonmanage.TaskDetailService;
 import com.hp.cmsz.web.PageURLController;

-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 @Controller
 @RequestMapping(value = "/BaseManage/TaskManage/*")
 public class TaskManageController {
@@ -55,10 +55,20 @@ public class TaskManageController {
    @Autowired
    private com.hp.cmsz.repository.PublicDao PublicDao;

+    @Autowired
+    private DimKpiService dimKpiService;

    @Autowired
    private ChannelDataSourceMapDao channelDataSourceMapDao;

+    @Autowired
+    private APPEWarningDetailDao aPPEWarningDetailDao;
+    @Autowired
+    private EWarningCalcResultDao eWarningCalcResultDao;
+
+
+
+
    @RequestMapping(value = "/taskHome")
    public ModelAndView taskHome(String selectTab) {
        ModelAndView modelAndView = new ModelAndView(PageURLController.TaskHome);
@@ -80,9 +90,11 @@ public class TaskManageController {
    }

    @RequestMapping(value = "/taskListFrame")
-	public ModelAndView taskListFrame(@RequestParam(value = "page", defaultValue = "taskId") String sortType,
+    public ModelAndView taskListFrame(@RequestParam(value = "page",
+            defaultValue = "taskId") String sortType,
                                      @RequestParam(value = "page", defaultValue = "1") int pageNumber,
-			@RequestParam(value = "pageSize", defaultValue = "5") int pageSize, RunTask runTask, String newTaskStatus) {
+                                      @RequestParam(value = "pageSize", defaultValue = "5") int pageSize,
+                                      RunTask runTask, String newTaskStatus) {
        ModelAndView modelAndView = new ModelAndView(PageURLController.RunTaskList);
 		/*if (StringUtils.isNotEmpty(newTaskStatus) && runTask.getTaskId() != null) {
 			runTaskService.updateTaskStatus(runTask.getTaskId(), newTaskStatus);
@@ -94,7 +106,7 @@ public class TaskManageController {
        modelAndView.addObject("pageSize", pageSize);
        modelAndView.addObject("sortType", sortType);
        modelAndView.addObject("taskTypeList", runTaskService.getTaskTypeList());
-
+//		modelAndView.addObject("useType", defaultTaskType);
        return modelAndView;
    }

@@ -147,26 +159,31 @@ public class TaskManageController {
    }

    @RequestMapping(value = "/taskFormFrame")
-	public ModelAndView taskFormFrame(Long taskId, @RequestParam(required = false) String defaultTaskType) {
+    public ModelAndView taskFormFrame(Long taskId, @RequestParam(required = false) String defaultTaskType,String type) {
        ModelAndView modelAndView = new ModelAndView(PageURLController.RunTaskForm);
        RunTask runTask;
+        List<ModelParameter> modelParameterList = null;
        if (taskId != null) {
            runTask = runTaskService.getRunTask(taskId);
        } else {
            runTask = new RunTask();
            runTaskService.saveRunTask(runTask);//能够让模型参数根据任务id来进行关联，先把taskId传到前端
+
        }
        if (StringUtils.isNotEmpty(defaultTaskType)) {
            runTask.setDefaultTaskType(new Long(defaultTaskType));
        }
-
        //模型列表
        List<DataModel> dataModelList =  runTaskService.getDataModelViewList();
        //默认第一个模型的参数列表
-		List<ModelParameter> modelParameterList = null;
        if(dataModelList.size()!=0){
+            if(type.equals("new")){
                modelParameterList = modelParameterDao.findByDataModelIdAndIfSystemDefault(dataModelList.get(0).getDataModelId(),0L);
+            }else{
+                modelParameterList = modelParameterDao.findByTaskIdAndIfSystemDefault(runTask.getTaskId(),1L);
            }
+        }
+
        //查询出所以省份信息
        List<Province> provinceList = (List<Province>) PublicDao.findAll();

@@ -179,6 +196,7 @@ public class TaskManageController {
        //查询出所有的业务
        List<Business> businessList= (List<Business>) businessDao.findAll();

+
        List<ChannelDataSourceMap> channelDataSourceMapList = (List<ChannelDataSourceMap>) channelDataSourceMapDao.findAll();


@@ -187,19 +205,28 @@ public class TaskManageController {
        modelAndView.addObject("channelList", channelList);
        modelAndView.addObject("datasourceList", datasourceList);
        modelAndView.addObject("businessList", businessList);
+
        modelAndView.addObject("channelDataSourceMapList", channelDataSourceMapList);
-		//modelAndView.addObject("isModel", isModel);
        modelAndView.addObject("taskGroupList", runTaskService.getTaskGroupList());
-		/*modelAndView.addObject("taskTypeList", runTaskService.getTaskTypeList());*/
        modelAndView.addObject("sanboxList", taskDetailService.findTaskList(RunTaskDetail.TASK_TYPE_SANDBOX));
        modelAndView.addObject("recoverList", taskDetailService.findTaskList(RunTaskDetail.TASK_TYPE_RECOVER));
        modelAndView.addObject("dataModelList", dataModelList);
        modelAndView.addObject("dataModelParameterList", modelParameterList);
        modelAndView.addObject("taskTypeList", runTaskService.getTaskTypeList());
+        modelAndView.addObject("useType", type);
+
        cmszOperationLogService.createLog("新增", "模型任务", "RUN_TASK_T.taskId=" + runTask.getTaskId());
        return modelAndView;
    }

+    //根据业务查出指标
+    @RequestMapping("/findKpiByBusiness")
+    @ResponseBody
+    public List<DimKpi> findKpiByBusiness(String businessId){
+
+        return  dimKpiService.findAllByIsActiveAAndBusnameId(Long.parseLong(businessId));
+    }
+
    @RequestMapping(value = "/submitTaskFrame", method = { RequestMethod.POST })
    public String submitTaskFrame(RunTask runTask) {
        if ("1".equals(runTask.getFrequencyType())) {
@@ -246,13 +273,21 @@ public class TaskManageController {
    @ResponseBody
    public void createModelParam(
            @RequestParam(value="paramName") String paramName,
+            @RequestParam(value="paramId") String paramId,
+            @RequestParam(value="useType") String useType,
            @RequestParam(value="paramValue") String paramValue,
            @RequestParam(value="paramType") String paramType,
            @RequestParam(value="taskId") String taskId,
            @RequestParam(value="modelId") String modelId,
            HttpServletResponse response, HttpServletRequest request) {

-		ModelParameter modelParameter = new ModelParameter();
+        ModelParameter modelParameter=null;
+        if(useType.equals("new")){
+             modelParameter = new ModelParameter();
+        }else{
+            modelParameter = modelParameterDao.findOne(Long.parseLong(paramId));
+        }
+
        if(!paramName.trim().equals("")){modelParameter.setParameterName(paramName);}
        if(!paramValue.trim().equals("")){modelParameter.setParameterValue(paramValue);}
        if(!paramType.trim().equals("")){modelParameter.setParameterDataType(paramType);}
@@ -260,6 +295,7 @@ public class TaskManageController {
        if(!modelId.trim().equals("")){modelParameter.setDataModelId(Long.parseLong(modelId));}
        modelParameter.setIfSystemDefault(1L);
        modelParameterDao.save(modelParameter);
+
    }


@@ -289,12 +325,78 @@ public class TaskManageController {
        return runTaskService.checkNameAndCode(java.net.URLDecoder.decode(name, "UTF-8"), code, id, defaultTaskType);
    }

-//	public APPEWarningDetail ModelPreview(String id){
-//
-//
-//		return null;
-//	};



+
+    @RequestMapping(value = "/modelPreview")
+    @ResponseBody
+    public APPEWarningDetail ModelPreview(String id){
+        APPEWarningDetail app =null;
+
+        RunTask rt = runTaskService.getRunTask(Long.parseLong(id));
+        String path = "/home/dsadm/ETL/test/"+rt.getDataModelView().getModelScriptName()+" "+id;
+//        String path ="d:\\rscript\\a.r";
+        try {
+            Runtime run = Runtime.getRuntime();// 返回与当前 Java 应用程序相关的运行时对象
+            try {
+                String cmds = "Rscript "+path; // 注意：对字符串中路径\进行转义
+                Process p = run.exec(cmds);// 启动另一个进程来执行命令
+                InputStream is = p.getInputStream();
+                BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+                String line = null;
+                //[1] "13500001"
+                StringBuffer context = new StringBuffer();
+               while ((line = reader.readLine()) != null){
+                   System.out.println(line);
+                   context.append(line);
+               }
+
+                System.out.println("context:"+context);
+                int i = context.indexOf("EWARNING_DETAIL_ID:");
+                String k = context.substring(i+19,context.length()-1);
+
+                p.waitFor();
+                is.close();
+                reader.close();
+                p.destroy();
+                app = aPPEWarningDetailDao.findByEwarningDetailId(Long.parseLong(k));
+
+                app.seteWarningCalcResult(eWarningCalcResultDao.findByEwarningDetailId(app.getEwarningDetailId()));
+
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }catch (Exception e){
+            System.out.println("错误："+e.toString());
+        }
+        return app;
+    };
+    @RequestMapping(value = "/modelPreviewImg")
+    public void ModelPreview(HttpServletResponse response,String path){
+        System.out.println("fileName:"+path);
+        File file = new File("/home/dsadm/ETL/test/"+path);
+//        File file = new File("d:\\rscript\\al.jpg");
+        FileInputStream fis;
+        try {
+            fis = new FileInputStream(file);
+            long size = file.length();
+            byte[] temp = new byte[(int) size];
+            fis.read(temp, 0, (int) size);
+            fis.close();
+            byte[] data = temp;
+            response.setContentType("image/jpg");
+            OutputStream out = response.getOutputStream();
+            out.write(data);
+            out.flush();
+            out.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+
+    }
+
+
 }
\ No newline at end of file
--- a/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp
+++ b/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp
@@ -74,37 +74,66 @@
 		</div>
 	</div>
 <script type="">
-    function OpenDialog(data) {

-        //		var data = JSON.parse(data);
+	var dilog;
+
+    function editTask(e){
+//        var id = $('input[name="taskId"]:checked').val();
+		var id = e.id.split("_")[1];
+		var taskType=e.id.split("_")[0];
+        dilog.close();
+        document.getElementById("taskManageFrame").src='${ctx}'+"/BaseManage/TaskManage/taskFormFrame?defaultTaskType="+taskType+"&taskId=" + id+"&type=modify";
+    }
+
+    function OpenDialog(data,id,taskType) {
+        var df=new SimpleDateFormat();
+        df.applyPattern("yyyy-MM-dd HH:mm:ss");

        var content ="<div class='dialog-p' style='max-height: 560px; overflow-y: scroll; overflow-x: auto;'>" +
            "    <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-heading'>模型预览<input onclick='editTask(this)' id='"+taskType+"_"+id+"' 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>"+data.provinceName+"</td>" +
            "        <td width='10%'>数据来源</td>" +
-            "        <td>自定义</td>" +
+            "        <td>"+data.datasourceName+"</td>" +
            "        <td width='10%'>业务</td>" +
-            "        <td>自定义</td>" +
-            "        <td width='10%'>渠道</td>" +
-            "        <td>自定义</td>" +
+            "        <td>"+data.busname+"</td>" +
            "    </tr>" +
            "    <tr>" +
+            "        <td width='10%'>渠道</td>" +
+            "        <td>"+data.channelName+"</td>" +
            "        <td>指标编码</td>" +
-            "        <td>自定义</td>" +
+            "        <td>"+data.kpiCode+"</td>" +
            "        <td>指标名称</td>" +
-            "        <td>自定义</td>" +
+            "        <td>"+data.kpiName+"</td>" +
+            "    </tr>" +
+            "    <tr>" +
            "        <td>预测开始时间</td>" +
-            "        <td>自定义</td>" +
+            "        <td>"+df.format(new Date(data.busdatabegTime))+"</td>" +
            "        <td>预测结束时间</td>" +
-            "        <td>自定义</td>" +
+            "        <td>"+df.format(new Date(data.busdataendTime))+"</td>" +
+            "        <td>阈值1</td>" +
+            "        <td>"+removeNull(data.threshold1Val)+"</td>" +
+            "    </tr>" +
+            "    <tr>" +
+            "        <td>阈值2</td>" +
+            "        <td>"+removeNull(data.threshold2Val)+"</td>" +
+            "        <td>阈值3</td>" +
+            "        <td>"+removeNull(data.threshold3Val)+"</td>" +
+            "        <td>阈值告警1</td>" +
+            "        <td>"+removeNull(data.warn1Val)+"</td>" +
+            "    </tr>" +
+            "    <tr>" +
+            "        <td>阈值告警2</td>" +
+            "        <td>"+removeNull(data.warn2Val)+"</td>" +
+            "        <td>阈值告警3</td>" +
+            "        <td>"+removeNull(data.warn3Val)+"</td>" +
            "    </tr>" +
            "    <tr>" +
            "        <td colspan='8' align='center'>图表展示</td>" +
@@ -112,20 +141,46 @@
            "    <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>" +--%>
+            "                <img src='${ctx}/BaseManage/TaskManage/modelPreviewImg?path="+data.fileAddress+"'/>" +
+            "            </div>" +
+            "        </td>" +
+            "    </tr>" +
+            "    <tr>" +
+            "        <td colspan='8' align='center'>模型数据明细展示</td>" +
+            "    </tr>" +
+            "    <tr>" +
+            "        <td colspan='8'>" +
+            "            <div  class='panel-body'>" +
+            "                <table class='table '>" +
+            "    				<thead>" +
+            "        				<tr><th colspan='2'>时间</th><th colspan='2'>真实值</th><th colspan='2'>预测值</th></tr>" +
+            "    				</thead>" +
+            "    				<tbody>" ;
+
+        data.eWarningCalcResult = data.eWarningCalcResult.sort(function (a,b) {
+			return a.resultDate-b.resultDate
+        });
+		data.eWarningCalcResult.forEach(function (t) {
+			content = content+"<tr><td colspan='2'>"+df.format(new Date(t.resultDate))+"<td><td colspan='2'>"+t.dim1Val+"</td><td colspan='2'>"+t.dim2Val+"</td></tr>"
+		});
+        content = content+
+			"					</tbody>" +
+			"				</table>"+
            "            </div>" +
            "        </td>" +
            "    </tr>" +
            "</table>";
-        $.dialog({
+        dilog= $.dialog({
            title:'模型预览结果',
            content:content,
            lock: true
        });
    }
-    function preview() {
-        OpenDialog();
+	function removeNull(val) {
+		return val==null?"":val
    }
+
+
 </script>
 </body>


--- a/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp
+++ b/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp
@@ -38,6 +38,7 @@ var provinceOptions = new Array();
 var datasourceOptions = new Array();
 var channelOptions = new Array();
 var businessOptions = new Array();
+var kpiOptions = new Array();

 	$(document).ready(function() {
 		changeInputStatus('parallelFlg', 'parallelNums');
@@ -60,7 +61,6 @@ var businessOptions = new Array();
 		</c:forEach>
        $('#modelId').append(dataModelOptions);

-
        <c:forEach items="${provinceList}" var="province">
 			var option = new Option('${province.provinceName}','${province.provinceId}');
        	provinceOptions.push(option);
@@ -76,12 +76,12 @@ var businessOptions = new Array();
 						var channelName = "";
 						<c:forEach items="${channelList}" var="channel" varStatus="channelStatus">
 							<c:if test="${channel.channelId == channelDataSourceMap.channelId}" >
-       							 channelName='${channel.channelName}';
+								var channelOption = new Option('${channel.channelName}','${channel.channelId}');
+								channelOptions.push(channelOption);
 							</c:if>

 						</c:forEach>
-						var channelOption = new Option(channelName,'${channelDataSourceMap.channelId}');
-						channelOptions.push(channelOption);
+
 					</c:if>
 				</c:forEach>
 			</c:if>
@@ -95,10 +95,9 @@ var businessOptions = new Array();
            <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}">
+						<c:if test="${business.channelDataSourceMapId == channelDataSourceMap.channelDataSourceMapId && business.isActive =='Y' }">
 							var option = new Option('${business.businessName}','${business.businessId}');
 							businessOptions.push(option);
-
 						</c:if>
 					</c:forEach>
 				}
@@ -107,13 +106,31 @@ var businessOptions = new Array();
            $('#businessId').append(businessOptions);
        }
        changeBusinessData();
+        function changeKPIData(){
+           	var businessId =  $("#businessId").val();
+
+            $.ajax({
+                type : 'GET',
+                contentType : 'application/json',
+                url: "${ctx}/BaseManage/TaskManage/findKpiByBusiness?businessId="+businessId,
+                dataType : 'text',
+                beforeSend: function(data) {},
+                success: function(data) {
+                    $('#KPIViewId').empty();
+                    data = JSON.parse(data);
+                    data.forEach(function(t){
+                        var option = new Option(t.name,t.kpiId);
+                        $('#KPIViewId').append(option);
+                    })
+                }
+            });
+
+        }
+        changeKPIData();
 		<c:forEach items="${dataModelParameterList}" var="dataModelParameter">
-			var tr = "<tr><td>${dataModelParameter.parameterName}</td><td><input type='text' class='parameterValue' name='parameterValue' value='${dataModelParameter.parameterValue}'/></td><td>${dataModelParameter.parameterDataType}</td></tr>";
+			var tr = "<tr id='${dataModelParameter.parameterId}'><td>${dataModelParameter.parameterName}</td><td><input type='text' class='parameterValue' name='parameterValue' value='${dataModelParameter.parameterValue}'/></td><td>${dataModelParameter.parameterDataType}</td></tr>";
 			$('#addTr').append(tr);
 		</c:forEach>
-
-
-
 		changeTaskType();
 		$('#modelId').val('${runTask.dataModelView.dataModelId}');
 		$('#detailSelect').val('${runTask.taskDetail.taskInfoId}');
@@ -154,7 +171,7 @@ var businessOptions = new Array();
                    $('#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>";
+                        var tr = "<tr id='"+t.parameterId+"'><td>"+t.parameterName+"</td><td><input type='text' class='parameterValue' value='"+t.parameterValue+"'/></td><td>"+t.parameterDataType+"</td></tr>";
                        $('#addTr').append(tr);
 					})
                }
@@ -167,24 +184,27 @@ var businessOptions = new Array();
            <c:forEach items="${channelDataSourceMapList}" var="channelDataSourceMap" >
 				if('${channelDataSourceMap.dataSourceId}'==$("#datasourceViewId").val()){
                    var channelName = "";
-                    <c:forEach items="${channelList}" var="channel" varStatus="channelStatus">
+                    <c:forEach items="${channelList}" var="channel" >
 						<c:if test="${channel.channelId == channelDataSourceMap.channelId}" >
-                    channelName='${channel.channelName}';
+							var channelOption = new Option('${channel.channelName}','${channel.channelId}');
+							channelOptions.push(channelOption);
 						</c:if>
                    </c:forEach>
-                    var channelOption = new Option(channelName,'${channelDataSourceMap.channelId}');
-                    channelOptions.push(channelOption);
+
                }
            </c:forEach>
            $('#channelId').append(channelOptions);
            changeBusinessData();
+            changeKPIData()
 		});
        $('#channelId').change(function(){
            changeBusinessData();
+            changeKPIData()
 		})
+        $('#businessId').change(function(){

-
-
+            changeKPIData()
+        })


 	});
@@ -209,16 +229,17 @@ var businessOptions = new Array();
            }else {
                $("#addTr").find("tr").each(function () {
                    //alert($(this).find("td").eq(0).html());
+					var paramId = $(this).context.id;
                    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),
+                        url: "${ctx}/BaseManage/TaskManage/createModelParam?useType="+$("#useType").val()+"&paramId="+paramId+"&modelId="+encodeURIComponent(modelId)+"&paramName=" + encodeURIComponent(paramName) + "&paramValue=" + encodeURIComponent(paramValue) + "&paramType=" + paramType + "&taskId=" + taskId,
                        dataType: "text",
                        async: false,
                        beforeSend: function (data) {
@@ -399,6 +420,7 @@ var businessOptions = new Array();
 									<form id="detailForm" class="form-horizontal" role="form"
 										action="${ctx}/BaseManage/TaskManage/submitTaskFrame" method="post">
 										<input type="hidden" id="taskId" name="taskId" value="${runTask.taskId}">
+										<input type="hidden" id="useType" value="${useType}">
 										<input type="hidden" id="defaultTaskType" name="defaultTaskType" value="${runTask.defaultTaskType}">
 										<c:if test="${empty runTask.taskId}">
 											<input type="hidden" name="taskStatus" value="1">
@@ -418,7 +440,7 @@ var businessOptions = new Array();
 												<td>任务代码（<font color="red">必填</font>）：</td>
 												<td><input type="input" class="form-control input-sm" id="code" name="code" value="${runTask.code}"></td>
 											</tr>
-
+											<c:if test="${runTask.defaultTaskType == 1 || runTask.defaultTaskType == 5 }">
 												<tr>
 													<td id="provinceLabel">省份：</td>
 													<td id="provinceDiv">
@@ -430,7 +452,7 @@ var businessOptions = new Array();
 												<tr>
 													<td id="dataSourceLabel">数据来源：</td>
 													<td id="dataSourceDiv">
-													<select class="form-control input-sm" id="datasourceViewId" name="dataSource.dataSourceId" >
+														<select class="form-control input-sm" id="datasourceViewId" name="dataSourceView.dataSourceId" >
 														</select>
 													</td>
 												</tr>
@@ -438,7 +460,7 @@ var businessOptions = new Array();
 												<tr>
 													<td id="channelLabel">渠道：</td>
 													<td id="channelDiv">
-													<select class="form-control input-sm" id="channelId" >
+														<select class="form-control input-sm" id="channelId" name="channelView.channelId" >
 														</select>
 													</td>
 												</tr>
@@ -446,12 +468,20 @@ var businessOptions = new Array();
 												<tr>
 													<td id="businessLabel">业务：</td>
 													<td id="businessDiv">
-													<select class="form-control input-sm" id="businessId" >
+														<select class="form-control input-sm" id="businessId" name="businessView.businessId" >
 														</select>
 													</td>
 												</tr>

 												<tr>
+													<td id="KPILabel">指标：</td>
+													<td id="KPIDiv">
+														<select class="form-control input-sm" id="KPIViewId" name="dimKpiView.kpiId" >
+														</select>
+													</td>
+												</tr>
+											</c:if >
+											<tr>
 												<td>任务组：</td>
 												<td>
 													<select class="form-control input-sm" id="taskGroup" name="taskGroup.taskgroupId">
@@ -557,6 +587,7 @@ var businessOptions = new Array();
 													</td>
 												</tr>
 											</c:if>
+											<c:if test="${runTask.defaultTaskType == 1 || runTask.defaultTaskType == 5}">
 												<tr>
 													<td>模型参数：</td>
 													<td>
@@ -572,6 +603,23 @@ var businessOptions = new Array();
 														</div>
 													</td>
 												</tr>
+											</c:if>
+												<tr>
+													<td>任务内容：</td>
+													<td>
+														<c:if test="${runTask.defaultTaskType == 1 }">
+															<textarea class="form-control input-sm" rows="6" maxlength="666" disabled>r_model_task_agent.pl</textarea>
+															<input type="hidden" name="taskContext" value="r_model_task_agent.pl">
+														</c:if>
+
+														<c:if test="${runTask.defaultTaskType != 1 }">
+															<textarea class="form-control input-sm" rows="6" id="taskContextArea" maxlength="666">${runTask.taskContext}</textarea>
+															<input type="hidden" name="taskContext" id="taskContext" value="{runTask.taskContext}">
+														</c:if>
+													</td>
+												</tr>
+
+
 											<c:if test="${runTask.defaultTaskType != 3 }">
 												<tr id="taskMaxTimesRow">
 													<td>最大运行次数：</td>
@@ -585,7 +633,12 @@ var businessOptions = new Array();
 												<td>
 													<button type="button" id="modelSubmit" class="btn btn-primary" onclick="saveForm('taskId');">确定</button>
 													<!-- <button type="reset" class="btn btn-default" id="modelReset">清空</button> -->
+													<c:if test="${useType =='new'}">
 														<button type="reset" class="btn btn-warning" id="modelBack" onclick="abandonTask()">返回</button>
+													</c:if>
+													<c:if test="${useType =='modify'}">
+														<button type="reset" class="btn btn-warning" id="modelBack" onclick="window.location.href='${ctx}/BaseManage/TaskManage/taskListFrame?defaultTaskType=${runTask.defaultTaskType}'">返回</button>
+													</c:if>
 												</td>
 											</tr>
 										</table>

--- a/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp
+++ b/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp
@@ -29,7 +29,7 @@ taskName = "自定义任务";
 		$.dialog({
 			title: "提醒",
 			content:"确定新增" + taskName + "？",
-			ok: function(){window.location.href='${ctx}/BaseManage/TaskManage/taskFormFrame?defaultTaskType=${queryCondition.defaultTaskType}'},
+			ok: function(){window.location.href='${ctx}/BaseManage/TaskManage/taskFormFrame?defaultTaskType=${queryCondition.defaultTaskType}'+"&type=new"},
 			okValue:"确定",
 			cancel: function(){},
 			cancelValue:"取消",
@@ -46,7 +46,7 @@ taskName = "自定义任务";
 		$.dialog({
 			title: "提醒",
 			content:"确定修改" + taskName + "？",
-			ok: function(){window.location.href = '${ctx}/BaseManage/TaskManage/taskFormFrame?defaultTaskType=${queryCondition.defaultTaskType}&taskId=' + id;},
+			ok: function(){window.location.href = '${ctx}/BaseManage/TaskManage/taskFormFrame?defaultTaskType=${queryCondition.defaultTaskType}&taskId=' + id+"&type=modify";},
 			okValue:"确定",
 			cancel: function(){},
 			cancelValue:"取消",
@@ -134,10 +134,31 @@ taskName = "自定义任务";
 			}
 		});
 	}
-	function preview(){
-
+	function preview(e){
        var id = $('input[name="taskId"]:checked').val();
-        parent.preview();
+        var taskType = '${queryCondition.defaultTaskType}';
+        $.ajax({
+            type : 'GET',
+            'url' : '${ctx}/BaseManage/TaskManage/modelPreview?id='+id,
+            data : "",
+            success : function(data) {
+                parent.OpenDialog(data,id,taskType);
+            }
+        });
+
+
+
+
+
+
+
+
+
+
+	}
+
+	function choseTask(){
+        $("#ModelPreview").attr("disabled", false);
 	}

 	 $(document).ready(function(){

--- a/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp
+++ b/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp
@@ -12,7 +12,9 @@
 		<button class="btn-sm btn btn-warning btn-sm btn-group btn-group-cog" onclick="deleteTask();">删除</button>
 		<button class="btn-sm btn btn-primary btn-sm btn-group btn-group-cog" onclick="addTask();">新建</button>
 		<%--create by afe 2017-10-26--%>
-		<button class="btn-sm btn btn-primary btn-sm btn-group btn-group-cog" id="ModelPreview" onclick="preview()">模型预览</button>
+		<c:if test="${runTask.defaultTaskType == '1' || runTask.defaultTaskType == '5' }">
+				<button class="btn-sm btn btn-primary btn-sm btn-group btn-group-cog" id="ModelPreview" onclick="preview()" disabled>模型预览</button>
+		</c:if>
 	</div>
 </div>

@@ -20,14 +22,12 @@
 		<thead>
 			<tr>
 				<th>选择</th>
-
-				<%--2017-10-26 create by afe--%>
-				<%--<th>任务代码</th>--%>
+				<c:if test="${runTask.defaultTaskType == '1' || runTask.defaultTaskType == '5' }">
 					<th>省份</th>
 					<th>渠道</th>
 					<th>业务名称</th>
-				<th>数据类型</th>
-
+					<th>指标名称</th>
+				</c:if>
 				<th>任务名称</th>
 				<th>任务类型</th>
 				<th>任务绑定信息</th>
@@ -43,8 +43,13 @@

 			<c:forEach items="${taskList.content}" var="runTask">
 				<tr>
-					<td><input type="radio" name="taskId" id="taskId" value="${runTask.taskId}" /></td>
-					<td>${runTask.code}</td>
+					<td><input type="radio" name="taskId" id="taskId" value="${runTask.taskId}" onclick="choseTask()" /></td>
+					<c:if test="${runTask.taskType.tasktypeId == '1' || runTask.taskType.tasktypeId == '5' }">
+						<td>${runTask.provinceView.provinceName}</td>
+						<td>${runTask.channelView.channelName}</td>
+						<td>${runTask.businessView.businessName}</td>
+						<td>${runTask.dimKpiView.name}</td>
+					</c:if>
 					<td>${runTask.name}</td>
 					<td>
 						<c:forEach items="${taskTypeList}" var="taskType">

--- a/src/main/webapp/WEB-INF/views/error/500.jsp
+++ b/src/main/webapp/WEB-INF/views/error/500.jsp
@@ -9,16 +9,12 @@
 		ex = exception;
 	if (request.getAttribute("javax.servlet.error.exception") != null)
 		ex = (Throwable) request.getAttribute("javax.servlet.error.exception");
-
-    if(ex.getMessage().substring(0, 6).equals("R_HOME")){%>--%>
-        <c:set value="服务器上的R语言环境没配置正确或者Rserve服务没有启动！" var="msg" scope="page" />
-    <%}else{ %>
-        <c:set value="<%=ex.getMessage() %>" var="msg" scope="page" />
-    <%}
-
+   %>
+        <c:set value="<%=ex.toString() %>" var="msg" scope="page" />
+    <%
 	//记录日志
 	Logger logger = LoggerFactory.getLogger("500.jsp");
-	logger.error(ex.getMessage(), ex);
+	logger.error(ex.toString(), ex);
 %>

 <!DOCTYPE html>

--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -173,6 +173,10 @@
 		<location>/WEB-INF/views/error/500.jsp</location>
 	</error-page>
 	<error-page>
+		<exception-type>java.lang.Exception</exception-type>
+		<location>/WEB-INF/views/error/500.jsp</location>
+	</error-page>
+	<error-page>
 		<error-code>500</error-code>
 		<location>/WEB-INF/views/error/500.jsp</location>
 	</error-page>

--- a/src/main/webapp/static/js/validation.js
+++ b/src/main/webapp/static/js/validation.js
@@ -110,7 +110,7 @@ function checkAndSubmit(url, data) {

 function saveForm(id) {
 	var message = "";
-	if($("#"+id).val()) {
+	if($("#useType").val()!="new") {
 		message = "确定修改吗？";
 	} else {
 		message = "确定增加吗？";