Skip to content

C
cmszMonitorAnalysis
Commit 515d1dc9 authored by 胡斌's avatar 胡斌
Browse files
Options

增加模型状态

parent 66b8c680
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 61 deletions
.idea/workspace.xml
View file @ 515d1dc9
......@@ -6,23 +6,9 @@
</artifacts-to-build>
</component>
<component name="ChangeListManager">
<list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/CmszMonitorAnalysis.war" afterPath="$PROJECT_DIR$/CmszMonitorAnalysis.war" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/entity/QualityRule.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/entity/QualityRule.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/QualityRuleDao.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/repository/QualityRuleDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/service/analysissupport/QualityRuleService.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/service/analysissupport/QualityRuleService.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/analysissupport/QualityRuleConfigurationController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.class" afterPath="$PROJECT_DIR$/build/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/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$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/modelmanage/ModelMaintainController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/modelmanage/ModelMaintainController.class" />
<list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="智能分析平台备份">
<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/KpiDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.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" />
</list>
<ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
<ignored path="$PROJECT_DIR$/target/" />
......@@ -62,11 +48,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="TSWBAnalysisController.java" pinned="false" current-in-tab="true">
<file leaf-file-name="TSWBAnalysisController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/TSWBAnalysisController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="502">
<caret line="131" column="5" lean-forward="true" selection-start-line="131" selection-start-column="5" selection-end-line="131" selection-end-column="5" />
<state relative-caret-position="-338">
<caret line="120" column="35" lean-forward="false" selection-start-line="120" selection-start-column="35" selection-end-line="120" selection-end-column="35" />
<folding>
<element signature="e#10981#10989#0" expanded="true" />
</folding>
......@@ -84,21 +70,21 @@
</provider>
</entry>
</file>
<file leaf-file-name="TaskManageController.java" pinned="false" current-in-tab="false">
<file leaf-file-name="TaskManageController.java" pinned="false" current-in-tab="true">
<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="5736">
<caret line="265" column="19" lean-forward="false" selection-start-line="265" selection-start-column="19" selection-end-line="265" selection-end-column="19" />
<state relative-caret-position="464">
<caret line="247" column="39" lean-forward="false" selection-start-line="247" selection-start-column="39" selection-end-line="247" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="FilterRuleConfiguration.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleConfiguration.jsp">
<file leaf-file-name="RunTask.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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="216">
<caret line="99" column="38" lean-forward="false" selection-start-line="99" selection-start-column="28" selection-end-line="99" selection-end-column="38" />
<folding />
</state>
</provider>
......@@ -216,12 +202,12 @@
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/filterResultDetailTable.js" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleMaintainController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/KpiDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java" />
</list>
</option>
</component>
......@@ -340,7 +326,21 @@
<item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="cmsz" type="462c0819:PsiDirectoryNode" />
<item name="web" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
<item name="monitorAnalysis" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="cmsz" type="462c0819:PsiDirectoryNode" />
<item name="web" type="462c0819:PsiDirectoryNode" />
<item name="commonmanage" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="monitorAnalysis" type="b2602c69:ProjectViewProjectNode" />
......@@ -348,7 +348,6 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="webapp" type="462c0819:PsiDirectoryNode" />
<item name="WEB-INF" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
......@@ -625,7 +624,7 @@
<workItem from="1512456262858" duration="3504000" />
<workItem from="1512466677693" duration="623000" />
<workItem from="1512524336103" duration="2664000" />
<workItem from="1512546686381" duration="44000" />
<workItem from="1512546686381" duration="876000" />
</task>
<task id="LOCAL-00001" summary="first commit">
<created>1507828551888</created>
......@@ -760,11 +759,18 @@
<option name="project" value="LOCAL" />
<updated>1512385758690</updated>
</task>
<option name="localTasksCounter" value="20" />
<task id="LOCAL-00020" summary="智能分析平台备份">
<created>1512546811835</created>
<option name="number" value="00020" />
<option name="presentableId" value="LOCAL-00020" />
<option name="project" value="LOCAL" />
<updated>1512546811835</updated>
</task>
<option name="localTasksCounter" value="21" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="382506000" />
<option name="totallyTimeSpent" value="383338000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -795,10 +801,10 @@
<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.3271605" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.53858024" sideWeight="0.4939394" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.63580245" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.63580245" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2549168" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2549168" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
......@@ -909,7 +915,8 @@
<MESSAGE value="过滤规则维护页面编写" />
<MESSAGE value="合并刘娜代码" />
<MESSAGE value="过滤规则维护" />
<option name="LAST_COMMIT_MESSAGE" value="过滤规则维护" />
<MESSAGE value="智能分析平台备份" />
<option name="LAST_COMMIT_MESSAGE" value="智能分析平台备份" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -1183,6 +1190,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2472">
<caret line="103" column="34" lean-forward="false" selection-start-line="103" selection-start-column="24" selection-end-line="103" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
......@@ -1190,13 +1198,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10080">
<caret line="420" column="92" lean-forward="false" selection-start-line="420" selection-start-column="77" selection-end-line="420" selection-end-column="92" />
</state>
</provider>
</entry>
<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="1896">
<caret line="97" column="41" lean-forward="false" selection-start-line="97" selection-start-column="28" selection-end-line="97" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
......@@ -1207,22 +1209,6 @@
</state>
</provider>
</entry>
<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="5736">
<caret line="265" column="19" lean-forward="false" selection-start-line="265" selection-start-column="19" selection-end-line="265" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleConfiguration.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1056">
......@@ -1239,6 +1225,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="130">
<caret line="51" column="157" lean-forward="false" selection-start-line="51" selection-start-column="157" selection-end-line="51" selection-end-column="157" />
<folding />
</state>
</provider>
</entry>
......@@ -1296,14 +1283,38 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/TSWBAnalysisController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="502">
<caret line="131" column="5" lean-forward="true" selection-start-line="131" selection-start-column="5" selection-end-line="131" selection-end-column="5" />
<state relative-caret-position="-338">
<caret line="120" column="35" lean-forward="false" selection-start-line="120" selection-start-column="35" selection-end-line="120" selection-end-column="35" />
<folding>
<element signature="e#10981#10989#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleConfiguration.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="99" column="38" lean-forward="false" selection-start-line="99" selection-start-column="28" selection-end-line="99" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<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="464">
<caret line="247" column="39" lean-forward="false" selection-start-line="247" selection-start-column="39" selection-end-line="247" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
......
src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java
View file @ 515d1dc9
......@@ -245,7 +245,10 @@ public class TaskManageController {
} else {
action = "修改";
}
//System.out.println(runTask.getFrequency());
// System.out.println(runTask.getFrequency());
runTask.setTaskRunStatus("2");
runTask.setTaskStatus("1");
runTaskService.saveRunTask(runTask);
String tabName = "自定义任务";
if (new Long(1).equals(runTask.getDefaultTaskType())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment