Skip to content

C
cmszMonitorAnalysis
Commit 25299f62 authored by afe's avatar afe
Browse files
Options

Merge remote-tracking branch 'monitorAnalysis/liuna'

# Conflicts: # .idea/workspace.xml # src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class # src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ChannelDao.class # src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class # src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/BusinessService.class # src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.class # src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class # src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class # src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$1.class # src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$2.class # src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$3.class # src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$4.class # src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class
parents 1f031902 fbe65425
Hide whitespace changes
Inline Side-by-side
Showing with 1551 additions and 1137 deletions
.idea/workspace.xml
View file @ 25299f62
...@@ -6,36 +6,17 @@ ...@@ -6,36 +6,17 @@
</artifacts-to-build> </artifacts-to-build>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="2017年11月09 智能分析平台提交内容&#10; --数据库脚本更新"> <list default="true" readonly="true" id="729f43c8-1bb9-40d5-9567-47c5307fe3f5" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/APPEWarningDetail.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/CmszMonitorAnalysis.war" afterPath="$PROJECT_DIR$/CmszMonitorAnalysis.war" />
<change type="DELETED" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/commonmanage/RunTask.class" afterPath="" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class" />
<change type="DELETED" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/commonmanage/TaskManageController.class" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/ModelParameter.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/entity/ModelParameter.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ModelParameterDao.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ModelParameterDao.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/modelmanage/ModelMaintainController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/modelmanage/ModelMaintainController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.class" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/application.properties" afterPath="$PROJECT_DIR$/build/application.properties" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/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/web/monitoroperation/WorkingOrderCreateController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/ModelParameter.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/ModelParameter.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcd.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcd.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ModelParameterDao.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ModelParameterDao.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/insideXcdWarningTable.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/insideXcdWarningTable.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java" afterPath="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/application.properties" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/application.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelMaintain.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelMaintain.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/TaskHome.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/TaskHome.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/static/js/validation.js" afterPath="$PROJECT_DIR$/src/main/webapp/static/js/validation.js" />
</list> </list>
<ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" /> <ignored path="$PROJECT_DIR$/src/main/webapp/WEB-INF/classes/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -49,156 +30,53 @@ ...@@ -49,156 +30,53 @@
<option name="refreshEnabled" value="true" /> <option name="refreshEnabled" value="true" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
<file leaf-file-name="RunTask.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="98">
<caret line="206" column="28" lean-forward="false" selection-start-line="206" selection-start-column="28" selection-end-line="206" selection-end-column="28" />
<folding>
<element signature="e#4096#4097#0" expanded="true" />
<element signature="e#4122#4123#0" expanded="true" />
<element signature="e#4177#4178#0" expanded="true" />
<element signature="e#4216#4217#0" expanded="true" />
<element signature="e#4262#4263#0" expanded="true" />
<element signature="e#4299#4300#0" expanded="true" />
<element signature="e#4324#4325#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="TaskManageController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="296">
<caret line="179" column="17" lean-forward="false" selection-start-line="179" selection-start-column="17" selection-end-line="179" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
<element signature="method#queryResultFrame#0;class#TaskManageController#0" expanded="false" />
<element signature="method#updateStatusFrame#0;class#TaskManageController#0" expanded="false" />
<element signature="method#getModelParameterList#0;class#TaskManageController#0" expanded="false" />
<element signature="method#checkNameAndCode#0;class#TaskManageController#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Business.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Business.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="26" column="27" lean-forward="false" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="RunTaskForm.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2542">
<caret line="93" column="31" lean-forward="false" selection-start-line="93" selection-start-column="31" selection-end-line="93" selection-end-column="31" />
<folding>
<element signature="n#style#0;n#head#0;n#html#0;n#!!top" expanded="false" />
<element signature="e#5082#5862#0#HTML" expanded="false" />
<element signature="e#6912#6984#0#HTML" expanded="false" />
<element signature="e#7010#8961#0#HTML" expanded="false" />
<element signature="e#7466#7546#0#HTML" expanded="false" />
<element signature="e#7609#8932#0#HTML" expanded="false" />
<element signature="e#8991#9298#0#HTML" expanded="false" />
<element signature="e#9330#9700#0#HTML" expanded="false" />
<element signature="e#9740#9924#0#HTML" expanded="false" />
<element signature="e#9954#11267#0#HTML" expanded="false" />
<element signature="e#11292#11459#0#HTML" expanded="false" />
<element signature="e#11485#11658#0#HTML" expanded="false" />
<element signature="e#11684#11763#0#HTML" expanded="false" />
<element signature="e#11790#11869#0#HTML" expanded="false" />
<element signature="e#11892#12156#0#HTML" expanded="false" />
<element signature="e#12192#12641#0#HTML" expanded="false" />
<element signature="e#12665#13147#0#HTML" expanded="false" />
<element signature="n#tr#10;n#table#0;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#tr#11;n#table#0;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#c:if#15;n#jsp:root#0;n#!!top" expanded="false" />
<element signature="n#tr#12;n#table#0;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#td#1;n#tr#13;n#table#0;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Public_ProvinceTag.tag" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/Public_ProvinceTag.tag">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1078">
<caret line="17" column="48" lean-forward="false" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="48" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PublicDao.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/PublicDao.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="326">
<caret line="23" column="25" lean-forward="false" selection-start-line="23" selection-start-column="25" selection-end-line="23" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
<list> <list>
<option value="Jsp File" /> <option value="Jsp File" />
<option value="Interface" />
<option value="Class" /> <option value="Class" />
<option value="Interface" />
</list> </list>
</option> </option>
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>taskFormFrame</find> <find>k==7</find>
<find>UPDATE &quot;fxjm_model_parameter_info_t&quot; SET &quot;DATA_MODEL_ID&quot; = -4 WHERE &quot;PARAMETER_ID&quot; = 1</find> <find>create</find>
<find>APPEWarningDetail</find> <find>xcdWarningInfoViewService</find>
<find>fxjm_model_parameter_info_t</find> <find>glyphicon-class</find>
<find>ajax</find> <find>style</find>
<find>saveForm</find> <find>exportWord</find>
<find>modelSubmit</find> <find>createForm</find>
<find>validation</find> <find>upload</find>
<find>FrequencyType</find> <find>window.open</find>
<find>modelParameterService</find> <find>header[7]</find>
<find>submitTaskFrame</find> <find>console.log</find>
<find>submitForm</find> <find>==</find>
<find>abandonTask</find> <find>viewAction</find>
<find>submit</find> <find>pentaho/view</find>
<find>taskDeleteFrame</find> <find>biserver_config</find>
<find>taskListFrame</find> <find>initDate</find>
<find>validate</find> <find>/home/hg</find>
<find>PublicProvinceTag</find> <find>新建</find>
<find>section</find> <find>GJFX_warni</find>
<find>dataModelView</find> <find>XcdChangeOrderDao</find>
<find>modelId</find> <find>XcdChangeOrderService</find>
<find>datasource</find> <find>createInsideWorkingOrder</find>
<find>datasourceId</find> <find>内部</find>
<find>DIM_CHANNEL_DATA_SOURCE_MAP_T</find> <find>updateRelXcdIdByWarningId</find>
<find>ChannelDataSourceMap</find> <find>warningId</find>
<find>ChannelDataSourceMapDao</find> <find>下发协查单</find>
<find>datasourceViewId</find> <find>returninfo</find>
<find>channelId</find> <find>getUrlParams</find>
<find>channelDataSourceMapId</find> <find>green-tr</find>
<find>change</find> <find>update</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>InsideXcdWorkingOrderInfoView</replace> <replace>InsideXcdWorkingOrderInfoView</replace>
</replaceStrings> </replaceStrings>
<dirStrings>
<dir>D:\代码\智能分析平台\CmszMonitorAnalysis\trunk\src\main\java\com\hp\cmsz\web\modelmanage</dir>
<dir>D:\代码\智能分析平台\CmszMonitorAnalysis\trunk\src\main\webapp\WEB-INF\views\error</dir>
<dir>D:\代码\智能分析平台\CmszMonitorAnalysis\trunk</dir>
</dirStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
...@@ -217,6 +95,25 @@ ...@@ -217,6 +95,25 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/gson-2.2.4.jar!/com/google/gson/Gson.class" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java" />
<option value="$PROJECT_DIR$/src/main/resources/application.properties" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/WarningFilter.tag" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/Model_DataType" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WarnAnalysis.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/PageURLController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/header.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderReasult.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdWorkingOrderInfo.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcd.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcdTable.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WarnAnalysisDetail.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/fop-1.1.jar!/org/apache/fop/afp/AFPEventProducer.class" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/ModelDataType.tag" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningSource.tag" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/commonutils.js" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoT.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoT.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoService.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoVieDao.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoVieDao.java" />
...@@ -243,31 +140,6 @@ ...@@ -243,31 +140,6 @@
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag" /> <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" /> <option value="$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java" /> <option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/static/css/styles.css" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/TaskHome.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp" />
<option value="$PROJECT_DIR$/src/main/resources/application.properties" />
<option value="$PROJECT_DIR$/build/application.properties" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataModel.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/ModelParameter.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ModelParameterDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelResultController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/APPEWarningDetail.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelMaintain.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/commonmanage/RunTaskService.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/static/js/validation.js" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar!/javax/persistence/FetchType.class" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/PublicDao.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Business.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java" />
<option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp" />
</list> </list>
</option> </option>
</component> </component>
...@@ -322,7 +194,6 @@ ...@@ -322,7 +194,6 @@
<pane id="AndroidView" /> <pane id="AndroidView" />
<pane id="Scope" /> <pane id="Scope" />
<pane id="Scratches" /> <pane id="Scratches" />
<pane id="PackagesPane" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
...@@ -330,20 +201,26 @@ ...@@ -330,20 +201,26 @@
<item name="trunk" type="b2602c69:ProjectViewProjectNode" /> <item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" type="462c0819:PsiDirectoryNode" /> <item name="trunk" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="trunk" type="b2602c69:ProjectViewProjectNode" />
<item name="trunk" type="462c0819:PsiDirectoryNode" />
<item name="数据库脚本" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.last.edited" value="Artifacts" />
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" /> <property name="project.structure.side.proportion" value="0.2" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../大屏前台/http" />
<property name="settings.editor.selected.configurable" value="project.propDebugger" /> <property name="settings.editor.selected.configurable" value="Settings.JavaScript" />
<property name="ignore_missing_gitignore" value="true" /> <property name="ignore_missing_gitignore" value="true" />
<property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/代码/智能分析平台/CmszMonitorAnalysis/trunk/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java&#10;afe&#9;PSI&#9;JAVA://org.apache.fop.afp.AFPEventProducer&#10;hea&#9;FILE&#9;file://D:/代码/智能分析平台/CmszMonitorAnalysis/trunk/src/main/webapp/WEB-INF/layouts/header.jsp" /> <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file://D:/代码/智能分析平台/CmszMonitorAnalysis/trunk/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java&#10;afe&#9;PSI&#9;JAVA://org.apache.fop.afp.AFPEventProducer&#10;hea&#9;FILE&#9;file://D:/代码/智能分析平台/CmszMonitorAnalysis/trunk/src/main/webapp/WEB-INF/layouts/header.jsp" />
<property name="jsx.switch.disabled" value="true" /> <property name="jsx.switch.disabled" value="true" />
...@@ -580,10 +457,6 @@ ...@@ -580,10 +457,6 @@
<workItem from="1510044948539" duration="32189000" /> <workItem from="1510044948539" duration="32189000" />
<workItem from="1510981253246" duration="11664000" /> <workItem from="1510981253246" duration="11664000" />
<workItem from="1511142387727" duration="53000" /> <workItem from="1511142387727" duration="53000" />
<workItem from="1511144873872" duration="1448000" />
<workItem from="1511228003131" duration="3743000" />
<workItem from="1511332805883" duration="13587000" />
<workItem from="1511403483208" duration="36296000" />
</task> </task>
<task id="LOCAL-00001" summary="first commit"> <task id="LOCAL-00001" summary="first commit">
<created>1507828551888</created> <created>1507828551888</created>
...@@ -659,10 +532,10 @@ ...@@ -659,10 +532,10 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="269383000" /> <option name="totallyTimeSpent" value="213873000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1380" height="744" extended-state="6" /> <frame x="-8" y="-8" width="1616" height="876" extended-state="6" />
<layout> <layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.58388156" sideWeight="0.5060606" order="8" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.58388156" sideWeight="0.5060606" order="8" side_tool="true" content_ui="tabs" />
...@@ -675,29 +548,29 @@ ...@@ -675,29 +548,29 @@
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39802632" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39901477" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3223684" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.59375" sideWeight="0.4939394" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3972973" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3972973" sideWeight="0.49545455" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.7582237" sideWeight="0.4939394" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28787878" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2377892" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" /> <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
<window_info id="SVN Repositories" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="SVN Repositories" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32840723" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3223684" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -719,7 +592,6 @@ ...@@ -719,7 +592,6 @@
<entry key="MAIN"> <entry key="MAIN">
<value> <value>
<State> <State>
<option name="BEK_SORT_TYPE" value="1" />
<option name="RECENTLY_FILTERED_USER_GROUPS"> <option name="RECENTLY_FILTERED_USER_GROUPS">
<collection /> <collection />
</option> </option>
...@@ -766,7 +638,7 @@ ...@@ -766,7 +638,7 @@
<option name="timeStamp" value="17" /> <option name="timeStamp" value="17" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>
<option name="time" value="31" /> <option name="time" value="28" />
</breakpoint-manager> </breakpoint-manager>
<watches-manager /> <watches-manager />
</component> </component>
...@@ -783,471 +655,361 @@ ...@@ -783,471 +655,361 @@
</buildFile> </buildFile>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/commons/utils/Constant.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/FXJM_modelResult_DataModelTypeTag.tag">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85"> <state relative-caret-position="436">
<caret line="14" column="32" lean-forward="false" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" /> <caret line="90" column="13" lean-forward="false" selection-start-line="90" selection-start-column="13" selection-end-line="90" selection-end-column="13" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/AppData.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdWorkingOrderInfoDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="260">
<caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="16" selection-end-column="25" /> <caret line="78" column="12" lean-forward="true" selection-start-line="78" selection-start-column="12" selection-end-line="78" selection-end-column="12" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelParameterConfiguration.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/JCS_datasource_channle.tag">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276"> <state relative-caret-position="0">
<caret line="378" column="93" lean-forward="false" selection-start-line="378" selection-start-column="93" selection-end-line="378" selection-end-column="93" /> <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>
<marker date="1510148642792" expanded="true" signature="12804:12810" ph="&amp;nbsp;" />
<marker date="1510148642792" expanded="true" signature="12810:12816" ph="&amp;nbsp;" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataModelType.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningSource.tag">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128"> <state relative-caret-position="132">
<caret line="17" column="13" lean-forward="false" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" /> <caret line="9" column="51" lean-forward="false" selection-start-line="9" selection-start-column="51" selection-end-line="9" selection-end-column="51" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ModelParameterDao.java"> <entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/spring-data-commons-1.5.1.RELEASE.jar!/org/springframework/data/repository/CrudRepository.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="164"> <state relative-caret-position="194">
<caret line="33" column="24" lean-forward="true" selection-start-line="33" selection-start-column="24" selection-end-line="33" selection-end-column="24" /> <caret line="16" column="26" lean-forward="false" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelResultController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/TSWB_FocusDataDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="326"> <state relative-caret-position="198">
<caret line="320" column="56" lean-forward="true" selection-start-line="320" selection-start-column="56" selection-end-line="320" selection-end-column="56" /> <caret line="13" column="71" lean-forward="true" selection-start-line="13" selection-start-column="54" selection-end-line="13" selection-end-column="71" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelMonitor.jsp"> <entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/spring-data-commons-1.5.1.RELEASE.jar!/org/springframework/data/repository/PagingAndSortingRepository.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-300"> <state relative-caret-position="198">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="10" column="44" lean-forward="false" selection-start-line="10" selection-start-column="44" selection-end-line="10" selection-end-column="44" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/TaskHome.jsp"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfoView.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-110"> <state relative-caret-position="238">
<caret line="34" column="0" lean-forward="true" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" /> <caret line="16" column="36" lean-forward="false" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="36" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/PageURLController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/analysissupport/TSWBAnalysisService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194"> <state relative-caret-position="198">
<caret line="210" column="85" lean-forward="false" selection-start-line="210" selection-start-column="74" selection-end-line="210" selection-end-column="85" /> <caret line="50" column="41" lean-forward="true" selection-start-line="50" selection-start-column="41" selection-end-line="50" selection-end-column="41" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/table.js"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/analysissupport/TSWBAnalysisController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22"> <state relative-caret-position="40">
<caret line="1" column="9" lean-forward="false" selection-start-line="1" selection-start-column="9" selection-end-line="1" selection-end-column="9" /> <caret line="92" column="97" lean-forward="false" selection-start-line="92" selection-start-column="86" selection-end-line="92" selection-end-column="97" />
<folding>
<marker date="1486961692000" expanded="true" signature="9572:9582" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderDetail.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194"> <state relative-caret-position="-66">
<caret line="289" column="40" lean-forward="false" selection-start-line="289" selection-start-column="40" selection-end-line="289" selection-end-column="40" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/APPEWarningDetail.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdWarningInfoViewDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132"> <state relative-caret-position="176">
<caret line="6" column="39" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="14" selection-end-column="0" /> <caret line="41" column="47" lean-forward="false" selection-start-line="41" selection-start-column="30" selection-end-line="41" selection-end-column="47" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/RegularityAnalysisController.java"> <entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/docx4j-3.1.0.jar!/org/docx4j/openpackaging/packages/OpcPackage.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2684"> <state relative-caret-position="194">
<caret line="257" column="48" lean-forward="true" selection-start-line="257" selection-start-column="48" selection-end-line="257" selection-end-column="48" /> <caret line="76" column="16" lean-forward="false" selection-start-line="76" selection-start-column="16" selection-end-line="76" selection-end-column="16" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcd.jsp"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/commons/utils/ExportWordUtil.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153"> <state relative-caret-position="274">
<caret line="199" column="73" lean-forward="true" selection-start-line="199" selection-start-column="25" selection-end-line="199" selection-end-column="73" /> <caret line="190" column="29" lean-forward="false" selection-start-line="190" selection-start-column="29" selection-end-line="190" selection-end-column="29" />
<folding>
<marker date="1511144121265" expanded="true" signature="13862:13918" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/TaskType.java"> <entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-396"> <state relative-caret-position="396">
<caret line="12" column="13" lean-forward="false" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" /> <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelParameterConfigurationController.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/modelResultDetailTable.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1223"> <state relative-caret-position="351">
<caret line="70" column="55" lean-forward="false" selection-start-line="70" selection-start-column="34" selection-end-line="70" selection-end-column="55" /> <caret line="322" column="60" lean-forward="true" selection-start-line="322" selection-start-column="60" selection-end-line="322" selection-end-column="60" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/layouts/default.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="98"> <state relative-caret-position="-182">
<caret line="95" column="46" lean-forward="false" selection-start-line="95" selection-start-column="30" selection-end-line="95" selection-end-column="46" /> <caret line="21" column="8" lean-forward="false" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoViewDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198"> <state relative-caret-position="478">
<caret line="12" column="90" lean-forward="false" selection-start-line="12" selection-start-column="90" selection-end-line="12" selection-end-column="90" /> <caret line="28" column="0" lean-forward="true" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/ModelParameter.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/PeriodTag.tag">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-12"> <state relative-caret-position="286">
<caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" /> <caret line="100" column="17" lean-forward="false" selection-start-line="100" selection-start-column="9" selection-end-line="100" selection-end-column="17" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelMaintain.jsp"> <entry file="file://$PROJECT_DIR$/build.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242"> <state relative-caret-position="264">
<caret line="256" column="16" lean-forward="false" selection-start-line="256" selection-start-column="16" selection-end-line="263" selection-end-column="18" /> <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> <folding />
<marker date="1511438610913" expanded="true" signature="10247:10253" ph="&amp;nbsp;" />
<marker date="1511438610913" expanded="true" signature="10253:10259" ph="&amp;nbsp;" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/lib/JavaScriptLanguage.jar!/com/intellij/lang/javascript/index/predefined/EcmaScript.js"> <entry file="jar://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/lib/JavaScriptLanguage.jar!/com/intellij/lang/javascript/index/predefined/EcmaScript.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194"> <state relative-caret-position="146">
<caret line="55" column="0" lean-forward="false" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" /> <caret line="45" column="18" lean-forward="false" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="18" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskList.jsp"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/InsideXcdWorkingOrderInfoViewService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="307"> <state relative-caret-position="158">
<caret line="65" column="27" lean-forward="false" selection-start-line="65" selection-start-column="27" selection-end-line="65" selection-end-column="27" /> <caret line="19" column="47" lean-forward="false" selection-start-line="19" selection-start-column="47" selection-end-line="19" selection-end-column="47" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/GZFX_Provider_stats.tag"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ModelManage/ModelResult.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="140">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="83" column="145" lean-forward="false" selection-start-line="83" selection-start-column="143" selection-end-line="83" selection-end-column="145" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp"> <entry file="file://$PROJECT_DIR$/数据库脚本/201710/view.sql">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="382"> <state relative-caret-position="110">
<caret line="66" column="86" lean-forward="false" selection-start-line="66" selection-start-column="86" selection-end-line="66" selection-end-column="86" /> <caret line="5" column="36" lean-forward="true" selection-start-line="5" selection-start-column="36" selection-end-line="5" selection-end-column="36" />
<folding>
<element signature="n#style#0;n#iframe#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
<marker date="1511488800670" expanded="true" signature="2274:2330" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/RunTaskDetail.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderDetailController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194"> <state relative-caret-position="-1720">
<caret line="28" column="32" lean-forward="false" selection-start-line="28" selection-start-column="32" selection-end-line="28" selection-end-column="32" /> <caret line="64" column="13" lean-forward="false" selection-start-line="64" selection-start-column="13" selection-end-line="64" selection-end-column="13" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/spring-data-commons-1.5.1.RELEASE.jar!/org/springframework/data/repository/CrudRepository.class"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdWarningInfoView.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194"> <state relative-caret-position="264">
<caret line="16" column="26" lean-forward="false" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" /> <caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="39" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$PROJECT_DIR$/src/main/webapp/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar!/javax/persistence/FetchType.class"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132"> <state relative-caret-position="274">
<caret line="7" column="10" lean-forward="false" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" /> <caret line="37" column="32" lean-forward="false" selection-start-line="37" selection-start-column="32" selection-end-line="37" selection-end-column="32" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/TaskGroup.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/XcdChangeOrder.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110"> <state relative-caret-position="194">
<caret line="14" column="30" lean-forward="false" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="30" /> <caret line="20" column="13" lean-forward="false" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/commonmanage/RunTaskService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WarnAnalysisDetailController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="414"> <state relative-caret-position="-2112">
<caret line="144" column="22" lean-forward="false" selection-start-line="144" selection-start-column="22" selection-end-line="144" selection-end-column="22" /> <caret line="79" column="41" lean-forward="false" selection-start-line="79" selection-start-column="13" selection-end-line="79" selection-end-column="41" />
<folding>
<element signature="e#5318#5319#0" expanded="false" />
<element signature="e#5372#5373#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/validation.js"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/XcdChangeOrderDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418"> <state relative-caret-position="198">
<caret line="107" column="0" lean-forward="true" selection-start-line="107" selection-start-column="0" selection-end-line="107" selection-end-column="0" /> <caret line="18" column="34" lean-forward="false" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="34" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/PublicService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfo.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250"> <state relative-caret-position="176">
<caret line="30" column="42" lean-forward="false" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" /> <caret line="11" column="13" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
<folding>
<element signature="e#511#512#0" expanded="false" />
<element signature="e#566#567#0" expanded="false" />
<element signature="e#611#612#0" expanded="false" />
<element signature="e#665#666#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/GJFX_datasource_channle_business.tag"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/InsideXcdWorkingOrderInfoDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1122"> <state relative-caret-position="88">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="8" column="90" lean-forward="false" selection-start-line="8" selection-start-column="90" selection-end-line="8" selection-end-column="90" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/PublicProvinceTagController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdChangeOrderService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-80"> <state relative-caret-position="-248">
<caret line="44" column="45" lean-forward="false" selection-start-line="44" selection-start-column="45" selection-end-line="44" selection-end-column="45" /> <caret line="23" column="34" lean-forward="false" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="34" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="86"> <state relative-caret-position="186">
<caret line="551" column="60" lean-forward="false" selection-start-line="551" selection-start-column="60" selection-end-line="551" selection-end-column="60" /> <caret line="49" column="33" lean-forward="true" selection-start-line="49" selection-start-column="33" selection-end-line="49" selection-end-column="33" />
<folding>
<marker date="1511144121277" expanded="true" signature="47293:47349" ph="..." />
<marker date="1511144121277" expanded="true" signature="47572:47583" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/Public_ProvinceTag.tag"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderCreate.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1078"> <state relative-caret-position="307">
<caret line="17" column="48" lean-forward="false" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="48" /> <caret line="323" column="87" lean-forward="false" selection-start-line="323" selection-start-column="69" selection-end-line="323" selection-end-column="87" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/PublicDao.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/insideXcdWarningTable.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="326"> <state relative-caret-position="412">
<caret line="23" column="25" lean-forward="false" selection-start-line="23" selection-start-column="25" selection-end-line="23" selection-end-column="25" /> <caret line="586" column="11" lean-forward="true" selection-start-line="586" selection-start-column="11" selection-end-line="586" selection-end-column="11" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/BusinessDao.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/GjfxRelatedInsideWorkingOrder.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-94"> <state relative-caret-position="116">
<caret line="16" column="17" lean-forward="false" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="17" /> <caret line="33" column="16" lean-forward="false" selection-start-line="33" selection-start-column="16" selection-end-line="33" selection-end-column="16" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderManageControll.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="282"> <state relative-caret-position="-532">
<caret line="150" column="60" lean-forward="true" selection-start-line="150" selection-start-column="60" selection-end-line="150" selection-end-column="60" /> <caret line="83" column="13" lean-forward="false" selection-start-line="83" selection-start-column="13" selection-end-line="83" selection-end-column="13" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Province.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238"> <state relative-caret-position="110">
<caret line="25" column="27" lean-forward="false" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="27" /> <caret line="9" column="114" lean-forward="false" selection-start-line="9" selection-start-column="85" selection-end-line="9" selection-end-column="114" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataModel.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/InsideXcdController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194"> <state relative-caret-position="1826">
<caret line="21" column="13" lean-forward="false" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" /> <caret line="118" column="41" lean-forward="false" selection-start-line="118" selection-start-column="30" selection-end-line="118" selection-end-column="41" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ChannelDao.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderReasult.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="458"> <state relative-caret-position="0">
<caret line="34" column="0" lean-forward="true" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/ChannelDataSourceMapService.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_WarningStatus.tag">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194"> <state relative-caret-position="0">
<caret line="19" column="26" lean-forward="false" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/ChannelDataSourceMapDao.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/static/js/xcdWarningTable.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216"> <state relative-caret-position="186">
<caret line="19" column="40" lean-forward="false" selection-start-line="19" selection-start-column="17" selection-end-line="19" selection-end-column="40" /> <caret line="334" column="62" lean-forward="true" selection-start-line="334" selection-start-column="62" selection-end-line="334" selection-end-column="62" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/BusinessService.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/GjfxWarningInfo.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128"> <state relative-caret-position="172">
<caret line="27" column="20" lean-forward="false" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" /> <caret line="22" column="34" lean-forward="false" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="34" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Channel.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/repository/GjfxWarningInfoDao.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="172"> <state relative-caret-position="164">
<caret line="19" column="33" lean-forward="false" selection-start-line="19" selection-start-column="15" selection-end-line="19" selection-end-column="33" /> <caret line="31" column="60" lean-forward="false" selection-start-line="31" selection-start-column="47" selection-end-line="31" selection-end-column="60" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/DataSource.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="172"> <state relative-caret-position="352">
<caret line="19" column="37" lean-forward="false" selection-start-line="19" selection-start-column="15" selection-end-line="19" selection-end-column="37" /> <caret line="22" column="20" lean-forward="true" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/commonmanage/RunTask.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="98"> <state relative-caret-position="93">
<caret line="206" column="28" lean-forward="false" selection-start-line="206" selection-start-column="28" selection-end-line="206" selection-end-column="28" /> <caret line="25" column="4" lean-forward="true" selection-start-line="25" selection-start-column="4" selection-end-line="25" selection-end-column="4" />
<folding>
<element signature="e#4096#4097#0" expanded="true" />
<element signature="e#4122#4123#0" expanded="true" />
<element signature="e#4177#4178#0" expanded="true" />
<element signature="e#4216#4217#0" expanded="true" />
<element signature="e#4262#4263#0" expanded="true" />
<element signature="e#4299#4300#0" expanded="true" />
<element signature="e#4324#4325#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/views/MonitorOperation/InsideXcd.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2542"> <state relative-caret-position="8">
<caret line="93" column="31" lean-forward="false" selection-start-line="93" selection-start-column="31" selection-end-line="93" selection-end-column="31" /> <caret line="286" column="48" lean-forward="false" selection-start-line="286" selection-start-column="48" selection-end-line="286" selection-end-column="48" />
<folding>
<element signature="n#style#0;n#head#0;n#html#0;n#!!top" expanded="false" />
<element signature="e#5082#5862#0#HTML" expanded="false" />
<element signature="e#6912#6984#0#HTML" expanded="false" />
<element signature="e#7010#8961#0#HTML" expanded="false" />
<element signature="e#7466#7546#0#HTML" expanded="false" />
<element signature="e#7609#8932#0#HTML" expanded="false" />
<element signature="e#8991#9298#0#HTML" expanded="false" />
<element signature="e#9330#9700#0#HTML" expanded="false" />
<element signature="e#9740#9924#0#HTML" expanded="false" />
<element signature="e#9954#11267#0#HTML" expanded="false" />
<element signature="e#11292#11459#0#HTML" expanded="false" />
<element signature="e#11485#11658#0#HTML" expanded="false" />
<element signature="e#11684#11763#0#HTML" expanded="false" />
<element signature="e#11790#11869#0#HTML" expanded="false" />
<element signature="e#11892#12156#0#HTML" expanded="false" />
<element signature="e#12192#12641#0#HTML" expanded="false" />
<element signature="e#12665#13147#0#HTML" expanded="false" />
<element signature="n#tr#10;n#table#0;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#tr#11;n#table#0;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#c:if#15;n#jsp:root#0;n#!!top" expanded="false" />
<element signature="n#tr#12;n#table#0;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#td#1;n#tr#13;n#table#0;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/ChannelDataSourceMap.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220"> <state relative-caret-position="220">
<caret line="23" column="29" lean-forward="false" selection-start-line="23" selection-start-column="17" selection-end-line="23" selection-end-column="29" /> <caret line="685" column="51" lean-forward="false" selection-start-line="685" selection-start-column="51" selection-end-line="685" selection-end-column="51" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/service/monitoroperation/GjfxWarningInfoService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="296"> <state relative-caret-position="208">
<caret line="179" column="17" lean-forward="false" selection-start-line="179" selection-start-column="17" selection-end-line="179" selection-end-column="17" /> <caret line="28" column="39" lean-forward="false" selection-start-line="28" selection-start-column="39" selection-end-line="28" selection-end-column="39" />
<folding>
<element signature="imports" expanded="true" />
<element signature="method#queryResultFrame#0;class#TaskManageController#0" expanded="false" />
<element signature="method#updateStatusFrame#0;class#TaskManageController#0" expanded="false" />
<element signature="method#getModelParameterList#0;class#TaskManageController#0" expanded="false" />
<element signature="method#checkNameAndCode#0;class#TaskManageController#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/hp/cmsz/entity/Business.java"> <entry file="file://$PROJECT_DIR$/src/main/webapp/static/css/styles.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194"> <state relative-caret-position="22">
<caret line="26" column="27" lean-forward="false" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="27" /> <caret line="854" column="16" lean-forward="false" selection-start-line="854" selection-start-column="7" selection-end-line="854" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -1259,10 +1021,10 @@ ...@@ -1259,10 +1021,10 @@
<settings> <settings>
<artifact-editor> <artifact-editor>
<show-content> <show-content>
<type id="jpa-descriptors" />
<type id="javaee-facet-resources" />
<type id="artifact" /> <type id="artifact" />
<type id="javaee-facet-resources" />
<type id="library" /> <type id="library" />
<type id="jpa-descriptors" />
</show-content> </show-content>
</artifact-editor> </artifact-editor>
<last-edited>CmszMonitorAnalysis</last-edited> <last-edited>CmszMonitorAnalysis</last-edited>
......
src/main/java/com/hp/cmsz/entity/AccuracyRule.java
View file @ 25299f62
...@@ -38,7 +38,7 @@ public class AccuracyRule implements Serializable { ...@@ -38,7 +38,7 @@ public class AccuracyRule implements Serializable {
@Id @Id
@GeneratedValue(strategy=GenerationType.SEQUENCE, generator="AccuracyRuleSequence") @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="AccuracyRuleSequence")
@SequenceGenerator(name = "AccuracyRuleSequence", sequenceName = "accuracy_rule_info_t_seq", allocationSize=1) @SequenceGenerator(name = "AccuracyRuleSequence", sequenceName = "ccolap.accuracy_rule_seq", allocationSize=1)
public Long getAccuracyRuleId() { public Long getAccuracyRuleId() {
return accuracyRuleId; return accuracyRuleId;
......
src/main/java/com/hp/cmsz/entity/DimKpi.java 0 → 100644
View file @ 25299f62
package com.hp.cmsz.entity;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
/**
* dim_kpi_t表对应的实体类
*
* @author Ma Wenmeng
*
*/
@Entity
@Table(name = "etl.dim_kpi_t")
public class DimKpi implements Serializable{
/**
*
*/
private Long kpiId;
private String code;
private String name;
private Long busnameId;
private Date crtTime;
private String crtUser;
private String currentVersion;
private Date invalidTime;
private Long origKpiId;
private Long kpiTypeId;
private String bacType;
private String isActive;
private Long kpiCycleTypeId;
private String calCycle;
private String ifPercentageKpi;
@Id
@GeneratedValue(strategy=GenerationType.SEQUENCE, generator="DimKpiSequence")
@SequenceGenerator(name = "DimKpiSequence", sequenceName = "dim_kpi_seq", allocationSize=1)
public Long getKpiId() {
return kpiId;
}
public void setKpiId(Long kpiId) {
this.kpiId = kpiId;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Long getBusnameId() {
return busnameId;
}
public void setBusnameId(Long busnameId) {
this.busnameId = busnameId;
}
public Date getCrtTime() {
return crtTime;
}
public void setCrtTime(Date crtTime) {
this.crtTime = crtTime;
}
public String getCrtUser() {
return crtUser;
}
public void setCrtUser(String crtUser) {
this.crtUser = crtUser;
}
public String getCurrentVersion() {
return currentVersion;
}
public void setCurrentVersion(String currentVersion) {
this.currentVersion = currentVersion;
}
public Date getInvalidTime() {
return invalidTime;
}
public void setInvalidTime(Date invalidTime) {
this.invalidTime = invalidTime;
}
public Long getOrigKpiId() {
return origKpiId;
}
public void setOrigKpiId(Long origKpiId) {
this.origKpiId = origKpiId;
}
public Long getKpiTypeId() {
return kpiTypeId;
}
public void setKpiTypeId(Long kpiTypeId) {
this.kpiTypeId = kpiTypeId;
}
public String getBacType() {
return bacType;
}
public void setBacType(String bacType) {
this.bacType = bacType;
}
public String getIsActive() {
return isActive;
}
public void setIsActive(String isActive) {
this.isActive = isActive;
}
public Long getKpiCycleTypeId() {
return kpiCycleTypeId;
}
public void setKpiCycleTypeId(Long kpiCycleTypeId) {
this.kpiCycleTypeId = kpiCycleTypeId;
}
public String getCalCycle() {
return calCycle;
}
public void setCalCycle(String calCycle) {
this.calCycle = calCycle;
}
public String getIfPercentageKpi() {
return ifPercentageKpi;
}
public void setIfPercentageKpi(String ifPercentageKpi) {
this.ifPercentageKpi = ifPercentageKpi;
}
}
src/main/java/com/hp/cmsz/entity/InsideXcdWorkingOrderInfo.java
View file @ 25299f62
...@@ -60,7 +60,6 @@ public class InsideXcdWorkingOrderInfo { ...@@ -60,7 +60,6 @@ public class InsideXcdWorkingOrderInfo {
@Id @Id
@GeneratedValue(strategy= GenerationType.SEQUENCE, generator="XcdWorkingOrderInfoSequence") @GeneratedValue(strategy= GenerationType.SEQUENCE, generator="XcdWorkingOrderInfoSequence")
@SequenceGenerator(name = "XcdWorkingOrderInfoSequence", sequenceName = "seq_inner_Working_Order_id", allocationSize=1) @SequenceGenerator(name = "XcdWorkingOrderInfoSequence", sequenceName = "seq_inner_Working_Order_id", allocationSize=1)
public Long getInnerWorkingOrderId() { public Long getInnerWorkingOrderId() {
return innerWorkingOrderId; return innerWorkingOrderId;
} }
......
src/main/java/com/hp/cmsz/entity/QualityRule.java
View file @ 25299f62
package com.hp.cmsz.entity; package com.hp.cmsz.entity;
import java.io.Serializable; import java.io.Serializable;
import java.sql.Timestamp;
import java.util.Date; import java.util.Date;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType; import javax.persistence.GenerationType;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.SequenceGenerator; import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
/** /**
* quality_rule_warehouse_info_t表对应的实体类 * quality_rule_warehouse_info_t表对应的实体类
...@@ -14,27 +17,27 @@ import javax.persistence.SequenceGenerator; ...@@ -14,27 +17,27 @@ import javax.persistence.SequenceGenerator;
* @author Liu Na * @author Liu Na
* *
*/ */
@Entity
public class QualityRule implements Serializable { @Table(name = "quality_rule_warehouse_info_t")
public class QualityRule {
private Long qualityRuleId;//质量规则ID private Long qualityRuleId;//质量规则ID
private Long businessId;//业务ID private Long businessId;//业务ID
private Long kpiId;//指标ID private Long kpiId;//指标ID
private Long channelId;//渠道ID private Long channelId;//渠道ID
private Long provinceId;//省份维表ID private Long provinceId;//省份维表ID
private Long taskId;//任务ID
private Long dataSourceId;//数据来源ID private Long dataSourceId;//数据来源ID
private String kpiMonitorTime;//指标检测时间 private String kpiMonitorTime;//指标检测时间
private String kpiMonitorRange;//指标检查范围 private String kpiMonitorRunTime;
private double integrityThresholdValue;//完整性阈值 private String businessTime;//指标业务时间
private Long timelinessThresholdValue;//及时性阈值
private Date ruleCrtTime;//规则创建时间 private Date ruleCrtTime;//规则创建时间
private Date ruleUpdateTime;//规则更新时间 private Date ruleUpdateTime;//规则更新时间
private String rileValidFlag;//规则是否有效 private String ruleValidFlag;//规则是否有效
private String ifSystemValue;
@Id @Id
@GeneratedValue(strategy=GenerationType.SEQUENCE, generator="QualityRuleSequence") @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="QualityRuleSequence")
@SequenceGenerator(name = "QualityRuleSequence", sequenceName = "quality_rule_warehouse_info_t_seq", allocationSize=1) @SequenceGenerator(name = "QualityRuleSequence", sequenceName = "ccolap.quality_rule_deq", allocationSize=1)
public Long getQualityRuleId() { public Long getQualityRuleId() {
return qualityRuleId; return qualityRuleId;
} }
...@@ -65,12 +68,6 @@ public class QualityRule implements Serializable { ...@@ -65,12 +68,6 @@ public class QualityRule implements Serializable {
public void setProvinceId(Long provinceId) { public void setProvinceId(Long provinceId) {
this.provinceId = provinceId; this.provinceId = provinceId;
} }
public Long getTaskId() {
return taskId;
}
public void setTaskId(Long taskId) {
this.taskId = taskId;
}
public Long getDataSourceId() { public Long getDataSourceId() {
return dataSourceId; return dataSourceId;
} }
...@@ -83,23 +80,17 @@ public class QualityRule implements Serializable { ...@@ -83,23 +80,17 @@ public class QualityRule implements Serializable {
public void setKpiMonitorTime(String kpiMonitorTime) { public void setKpiMonitorTime(String kpiMonitorTime) {
this.kpiMonitorTime = kpiMonitorTime; this.kpiMonitorTime = kpiMonitorTime;
} }
public String getKpiMonitorRange() { public String getKpiMonitorRunTime() {
return kpiMonitorRange; return kpiMonitorRunTime;
}
public void setKpiMonitorRange(String kpiMonitorRange) {
this.kpiMonitorRange = kpiMonitorRange;
}
public double getIntegrityThresholdValue() {
return integrityThresholdValue;
} }
public void setIntegrityThresholdValue(double integrityThresholdValue) { public void setKpiMonitorRunTime(String kpiMonitorRunTime) {
this.integrityThresholdValue = integrityThresholdValue; this.kpiMonitorRunTime = kpiMonitorRunTime;
} }
public Long getTimelinessThresholdValue() { public String getBusinessTime() {
return timelinessThresholdValue; return businessTime;
} }
public void setTimelinessThresholdValue(Long timelinessThresholdValue) { public void setBusinessTime(String businessTime) {
this.timelinessThresholdValue = timelinessThresholdValue; this.businessTime = businessTime;
} }
public Date getRuleCrtTime() { public Date getRuleCrtTime() {
return ruleCrtTime; return ruleCrtTime;
...@@ -113,13 +104,17 @@ public class QualityRule implements Serializable { ...@@ -113,13 +104,17 @@ public class QualityRule implements Serializable {
public void setRuleUpdateTime(Date ruleUpdateTime) { public void setRuleUpdateTime(Date ruleUpdateTime) {
this.ruleUpdateTime = ruleUpdateTime; this.ruleUpdateTime = ruleUpdateTime;
} }
public String getRileValidFlag() { public String getRuleValidFlag() {
return rileValidFlag; return ruleValidFlag;
} }
public void setRileValidFlag(String rileValidFlag) { public void setRuleValidFlag(String ruleValidFlag) {
this.rileValidFlag = rileValidFlag; this.ruleValidFlag = ruleValidFlag;
}
public String getIfSystemValue() {
return ifSystemValue;
}
public void setIfSystemValue(String ifSystemValue) {
this.ifSystemValue = ifSystemValue;
} }
} }
src/main/java/com/hp/cmsz/repository/AccuracyRuleDao.java
View file @ 25299f62
...@@ -34,7 +34,7 @@ public interface AccuracyRuleDao extends JpaSpecificationExecutor<AccuracyRule>, ...@@ -34,7 +34,7 @@ public interface AccuracyRuleDao extends JpaSpecificationExecutor<AccuracyRule>,
//根据准确性规则ID更新准确性规则信息 //根据准确性规则ID更新准确性规则信息
@Modifying @Modifying
@Query("update AccuracyRule ar set ar.ruleType=:ruleType, ar.scopeMaxValue=:scopeMaxValue, ar.scopeMinValue=:scopeMinValue, ar.repeatedCheckGranularity=:repeatedCheckGranularity, ar.repeatedCheckStartTime=:repeatedCheckStartTime, ar.repeatedCheckEndTime=:repeatedCheckEndTime, ar.ifRepeatedCheckSeries=:ifRepeatedCheckSeries, ar.repeatedCheckMaxTime=:repeatedCheckMaxTime, ar.ifRepeatedCheckSummation=:ifRepeatedCheckSummation where ar.accuracyRuleId =:accuracyRuleId") @Query("update AccuracyRule ar set ar.ruleType=:ruleType, ar.scopeMaxValue=:scopeMaxValue, ar.scopeMinValue=:scopeMinValue, ar.repeatedCheckGranularity=:repeatedCheckGranularity, ar.repeatedCheckStartTime=:repeatedCheckStartTime, ar.repeatedCheckEndTime=:repeatedCheckEndTime, ar.ifRepeatedCheckSeries=:ifRepeatedCheckSeries, ar.repeatedCheckMaxTime=:repeatedCheckMaxTime, ar.ifRepeatedCheckSummation=:ifRepeatedCheckSummation where ar.accuracyRuleId =:accuracyRuleId")
void updateAccuracyRuleByAccuracyRuleId(@Param("ruleType")String ruleType,@Param("scopeMaxValue")double scopeMaxValue,@Param("scopeMinValue")double scopeMinValue,@Param("repeatedCheckGranularity")String repeatedCheckGranularity,@Param("repeatedCheckStartTime")Date repeatedCheckStartTime,@Param("repeatedCheckEndTime")Date repeatedCheckEndTime,@Param("ifRepeatedCheckSeries")String ifRepeatedCheckSeries,@Param("repeatedCheckMaxTime")Long repeatedCheckMaxTime,@Param("ifRepeatedCheckSummation")String ifRepeatedCheckSummation); void updateAccuracyRuleByAccuracyRuleId(@Param("ruleType")String ruleType,@Param("scopeMaxValue")double scopeMaxValue,@Param("scopeMinValue")double scopeMinValue,@Param("repeatedCheckGranularity")String repeatedCheckGranularity,@Param("repeatedCheckStartTime")Date repeatedCheckStartTime,@Param("repeatedCheckEndTime")Date repeatedCheckEndTime,@Param("ifRepeatedCheckSeries")String ifRepeatedCheckSeries,@Param("repeatedCheckMaxTime")Long repeatedCheckMaxTime,@Param("ifRepeatedCheckSummation")String ifRepeatedCheckSummation,@Param("accuracyRuleId")Long accuracyRuleId);
//根据准确性规则ID删除一条准确性规则信息 //根据准确性规则ID删除一条准确性规则信息
@Modifying @Modifying
......
src/main/java/com/hp/cmsz/repository/BusinessDao.java
View file @ 25299f62
...@@ -39,6 +39,10 @@ public interface BusinessDao extends JpaSpecificationExecutor<Business>, ...@@ -39,6 +39,10 @@ public interface BusinessDao extends JpaSpecificationExecutor<Business>,
@Query("select business.businessId, business.businessName from Business business,ChannelDataSourceMap channelDataSourceMap where business.channelDataSourceMapId=channelDataSourceMap.channelDataSourceMapId and channelDataSourceMap.channelId = :channelIdList and channelDataSourceMap.dataSourceId =:datasourceIdList and business.businessId >= 0 order by business.businessId") @Query("select business.businessId, business.businessName from Business business,ChannelDataSourceMap channelDataSourceMap where business.channelDataSourceMapId=channelDataSourceMap.channelDataSourceMapId and channelDataSourceMap.channelId = :channelIdList and channelDataSourceMap.dataSourceId =:datasourceIdList and business.businessId >= 0 order by business.businessId")
List<Object[]> findBusinessIdAndBusinessNameByDataSourceIdAndChannelId(@Param("channelIdList") Long channelIdList,@Param("datasourceIdList") Long datasourceIdList); List<Object[]> findBusinessIdAndBusinessNameByDataSourceIdAndChannelId(@Param("channelIdList") Long channelIdList,@Param("datasourceIdList") Long datasourceIdList);
//由单个数据来源ID和单个渠道ID得到业务，加入isActive=N
@Query("select business.businessId, business.businessName from Business business,ChannelDataSourceMap channelDataSourceMap where business.isActive = 'Y' and business.channelDataSourceMapId=channelDataSourceMap.channelDataSourceMapId and channelDataSourceMap.channelId = :channelId and channelDataSourceMap.dataSourceId =:datasourceId and business.businessId >= 0 order by business.businessId")
List<Object[]> findBusinessIdAndBusinessNameByDataSourceIdAndChannelIdWithIsActive(@Param("channelId") Long channelId,@Param("datasourceId") Long datasourceId);
@Query("select business.businessId, business.businessName from Business business,ChannelDataSourceMap channelDataSourceMap,Channel channel where channel.channelId=channelDataSourceMap.channelId and business.channelDataSourceMapId=channelDataSourceMap.channelDataSourceMapId and channel.channelName=:channelName and business.businessId >= 0 order by business.businessId") @Query("select business.businessId, business.businessName from Business business,ChannelDataSourceMap channelDataSourceMap,Channel channel where channel.channelId=channelDataSourceMap.channelId and business.channelDataSourceMapId=channelDataSourceMap.channelDataSourceMapId and channel.channelName=:channelName and business.businessId >= 0 order by business.businessId")
List<Object[]> findBusinessByChannelName(@Param("channelName")String channelName); List<Object[]> findBusinessByChannelName(@Param("channelName")String channelName);
......
src/main/java/com/hp/cmsz/repository/ChannelDao.java
View file @ 25299f62
...@@ -19,6 +19,9 @@ public interface ChannelDao extends JpaSpecificationExecutor<Channel>, ...@@ -19,6 +19,9 @@ public interface ChannelDao extends JpaSpecificationExecutor<Channel>,
@Query("from Channel channel where channel.channelId >=0 order by channel.channelId") @Query("from Channel channel where channel.channelId >=0 order by channel.channelId")
List<Channel> findChannel(); List<Channel> findChannel();
@Query("from Channel channel where channel.channelId >=0 and channel.channelId <>7 order by channel.channelId")
List<Channel> findChannelWithoutAll();
List<Channel> findByChannelIdInOrderByChannelIdAsc(List<Long> channelIdList); List<Channel> findByChannelIdInOrderByChannelIdAsc(List<Long> channelIdList);
@Query("select channel from Channel channel, ChannelDataSourceMap channelDataSourceMap where channelDataSourceMap.channelId=channel.channelId and channelDataSourceMap.dataSourceId =:datasourceId and channel.channelId >=0 order by channel.channelId") @Query("select channel from Channel channel, ChannelDataSourceMap channelDataSourceMap where channelDataSourceMap.channelId=channel.channelId and channelDataSourceMap.dataSourceId =:datasourceId and channel.channelId >=0 order by channel.channelId")
......
src/main/java/com/hp/cmsz/repository/DimKpiDao.java 0 → 100644
View file @ 25299f62
package com.hp.cmsz.repository;
import java.util.List;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import com.hp.cmsz.entity.DimKpi;
public interface DimKpiDao extends JpaSpecificationExecutor<DimKpi>,
PagingAndSortingRepository<DimKpi, Long>{
//通过kpiTypeId查找数据采集频率
@Query("select dk.calCycle from DimKpi dk where dk.kpiTypeId = ?1")
List<String> findCayCycleByKpiTypeIdIn(@Param("kpiTypeId")Long kpiTypeId);
//通过kpiTypeId修改数据采集频率
@Modifying
@Query("update from DimKpi dk set dk.calCycle=:calCycle where dk.kpiTypeId=:kpiTypeId")
void updateDimKpiByKpiTypeId(@Param("calCycle")String calCycle,@Param("kpiTypeId")Long kpiTypeId);
}
src/main/java/com/hp/cmsz/repository/KpiDao.java
View file @ 25299f62
...@@ -37,7 +37,11 @@ public interface KpiDao extends JpaSpecificationExecutor<Kpi>,PagingAndSortingRe ...@@ -37,7 +37,11 @@ public interface KpiDao extends JpaSpecificationExecutor<Kpi>,PagingAndSortingRe
//由业务得到指标 //由业务得到指标
@Query("select kpi.kpiId, kpi.kpiName from Kpi kpi,Business business where kpi.businessId=business.businessId and business.businessId IN (:businessIdList) and kpi.kpiId >=0") @Query("select kpi.kpiId, kpi.kpiName from Kpi kpi,Business business where kpi.businessId=business.businessId and business.businessId IN (:businessIdList) and kpi.kpiId >=0")
List<Object[]> findAllKpiIdAndKpiNameByBusinessId(@Param("businessIdList") List<Long> businessIdList); List<Object[]> findAllKpiIdAndKpiNameByBusinessId(@Param("businessIdList") List<Long> businessIdList);
//由业务联动得到指标
@Query("select kpi.kpiId, kpi.kpiName from Kpi kpi,Business business where business.businessId = kpi.businessId and kpi.isActive = 'Y' and business.businessId in (:businessIds) and kpi.kpiId>=0 order by kpi.kpiId ")
List<Object[]> findKpiIdAndKpiNameByBusinessIds(@Param("businessIds")List<Long> businessIdList);
//由单个业务ID得到指标 //由单个业务ID得到指标
@Query("select kpi.kpiId, kpi.kpiName from Kpi kpi,Business business where kpi.businessId=business.businessId and business.businessId = :businessIdList and kpi.kpiId >=0") @Query("select kpi.kpiId, kpi.kpiName from Kpi kpi,Business business where kpi.businessId=business.businessId and business.businessId = :businessIdList and kpi.kpiId >=0")
List<Object[]> findKpiIdAndKpiNameByBusinessId(@Param("businessIdList") Long businessIdList); List<Object[]> findKpiIdAndKpiNameByBusinessId(@Param("businessIdList") Long businessIdList);
......
src/main/java/com/hp/cmsz/repository/QualityRuleDao.java
View file @ 25299f62
package com.hp.cmsz.repository; package com.hp.cmsz.repository;
import java.sql.Timestamp;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -20,7 +21,7 @@ import com.hp.cmsz.entity.QualityRule; ...@@ -20,7 +21,7 @@ import com.hp.cmsz.entity.QualityRule;
public interface QualityRuleDao extends JpaSpecificationExecutor<QualityRule>, public interface QualityRuleDao extends JpaSpecificationExecutor<QualityRule>,
PagingAndSortingRepository<QualityRule, Long>{ PagingAndSortingRepository<QualityRule, Long>{
List<QualityRule> findAll();
//根据质量规则ID查找质量规则 //根据质量规则ID查找质量规则
QualityRule findByQualityRuleId(Long qualityRuleId); QualityRule findByQualityRuleId(Long qualityRuleId);
...@@ -35,14 +36,14 @@ public interface QualityRuleDao extends JpaSpecificationExecutor<QualityRule>, ...@@ -35,14 +36,14 @@ public interface QualityRuleDao extends JpaSpecificationExecutor<QualityRule>,
//根据质量规则ID修改质量规则 //根据质量规则ID修改质量规则
@Modifying @Modifying
@Query("update from QualityRule qr set qr.businessId=:businessId, qr.kpiId=:kpiId, qr.channelId=:channelId, qr.provinceId=:provinceId, qr.dataSourceId=:dataSourceId, qr.kpiMonitorTime=:kpiMonitorTime, qr.kpiMonitorRange=:kpiMonitorRange,dm.integrityThresholdValue=:integrityThresholdValue, qr.timelinessThresholdValue=:timelinessThresholdValue, qr.ruleCrtTime=:ruleCrtTime, qr.ruleUpdateTime=:ruleUpdateTime where qr.qualityRuleId=:qualityRuleId") @Query("update from QualityRule qr set qr.businessId=:businessId, qr.kpiId=:kpiId, qr.channelId=:channelId, qr.provinceId=:provinceId, qr.dataSourceId=:dataSourceId, qr.kpiMonitorTime=:kpiMonitorTime, qr.kpiMonitorRunTime=:kpiMonitorRunTime, qr.businessTime=:businessTime, qr.ruleCrtTime=:ruleCrtTime, qr.ruleUpdateTime=:ruleUpdateTime where qr.qualityRuleId=:qualityRuleId")
void updateQualityRuleByQualityRuleId(@Param("businessId")Long businessId,@Param("kpiId")Long kpiId,@Param("channelId")Long channelId,@Param("provinceId")Long provinceId,@Param("dataSourceId")Long dataSourceId,@Param("kpiMonitorTime")String kpiMonitorTime,@Param("kpiMonitorRange")String kpiMonitorRange,@Param("integrityThresholdValue")double integrityThresholdValue,@Param("timelinessThresholdValue")Long timelinessThresholdValue,@Param("ruleCrtTime")Date ruleCrtTime,@Param("ruleUpdateTime")Date ruleUpdateTime,@Param("qualityRuleId")Long qualityRuleId); void updateQualityRuleByQualityRuleId(@Param("businessId")Long businessId,@Param("kpiId")Long kpiId,@Param("channelId")Long channelId,@Param("provinceId")Long provinceId,@Param("dataSourceId")Long dataSourceId,@Param("kpiMonitorTime")String kpiMonitorTime,@Param("kpiMonitorRunTime")String kpiMonitorRunTime,@Param("businessTime")String businessTime,@Param("ruleCrtTime")Date ruleCrtTime,@Param("ruleUpdateTime")Date ruleUpdateTime,@Param("qualityRuleId")Long qualityRuleId);
//根据质量规则ID得到数据条数 //根据质量规则ID得到数据条数
@Query("select count(*) from QualityRule qualityRule where qualityRule.qualityRuleId=:qualityRuleId") @Query("select count(*) from QualityRule qualityRule where qualityRule.qualityRuleId=:qualityRuleId")
Long getNumOfQualityRuleByQualityRuleId(@Param("qualityRuleId")String qualityRuleId); Long getNumOfQualityRuleByQualityRuleId(@Param("qualityRuleId")String qualityRuleId);
//根据省份、渠道、业务、指标查询质量规则 //根据省份、渠道、业务、数据来源筛选查询质量规则
List<QualityRule> findByProvinceIdInAndBusinessIdInAndKpiIdInAndChannelIdInOrderByQualityRuleIdDesc(List<Long> provinceId, List<Long> businessId, List<Long> kpiId, List<Long> channelId); List<QualityRule> findByProvinceIdInAndBusinessIdInAndDataSourceIdInAndChannelIdInOrderByQualityRuleIdDesc(Long[] province, Long[] business, Long[] datasource, Long[] channel);
} }
src/main/java/com/hp/cmsz/service/BusinessService.java
View file @ 25299f62
...@@ -30,6 +30,8 @@ public class BusinessService { ...@@ -30,6 +30,8 @@ public class BusinessService {
} }
public List<Business> getByChannelDataSourceMapIdIn(List<Long> channelDataSourceMapIdList){ public List<Business> getByChannelDataSourceMapIdIn(List<Long> channelDataSourceMapIdList){
return (List<Business>)businessDao.findByChannelDataSourceMapIdIn(channelDataSourceMapIdList); return (List<Business>)businessDao.findByChannelDataSourceMapIdIn(channelDataSourceMapIdList);
} }
......
src/main/java/com/hp/cmsz/service/analysissupport/AccuracyRuleService.java
View file @ 25299f62
...@@ -29,8 +29,8 @@ public class AccuracyRuleService { ...@@ -29,8 +29,8 @@ public class AccuracyRuleService {
//根据准确性规则ID更新准确性规则 //根据准确性规则ID更新准确性规则
@Transactional(readOnly=false) @Transactional(readOnly=false)
public void updateAccuracyRuleByAccuracyRuleId(String ruleType,double scopeMaxValue,double scopeMinValue,String repeatedCheckGranularity,Date repeatedCheckStartTime,Date repeatedCheckEndTime,String ifRepeatedCheckSeries,Long repeatedCheckMaxTime,String ifRepeatedCheckSummation){ public void updateAccuracyRuleByAccuracyRuleId(String ruleType,double scopeMaxValue,double scopeMinValue,String repeatedCheckGranularity,Date repeatedCheckStartTime,Date repeatedCheckEndTime,String ifRepeatedCheckSeries,Long repeatedCheckMaxTime,String ifRepeatedCheckSummation,Long accuracyRuleId){
accuracyRuleDao.updateAccuracyRuleByAccuracyRuleId(ruleType, scopeMaxValue, scopeMinValue, repeatedCheckGranularity, repeatedCheckStartTime, repeatedCheckEndTime, ifRepeatedCheckSeries, repeatedCheckMaxTime, ifRepeatedCheckSummation);; accuracyRuleDao.updateAccuracyRuleByAccuracyRuleId(ruleType, scopeMaxValue, scopeMinValue, repeatedCheckGranularity, repeatedCheckStartTime, repeatedCheckEndTime, ifRepeatedCheckSeries, repeatedCheckMaxTime, ifRepeatedCheckSummation,accuracyRuleId);
} }
//根据准确性规则ID删除一条准确性规则信息 //根据准确性规则ID删除一条准确性规则信息
......
src/main/java/com/hp/cmsz/service/analysissupport/DimKpiService.java 0 → 100644
View file @ 25299f62
package com.hp.cmsz.service.analysissupport;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.hp.cmsz.repository.DimKpiDao;
@Service
@Transactional
public class DimKpiService {
@Autowired
private DimKpiDao dimKpiDao;
//根据kpiTypeId修改数据采集频率
@Transactional(readOnly=false)
private void updateByKpiTypeId(String calCycle,Long kpiTypeId){
dimKpiDao.updateDimKpiByKpiTypeId(calCycle, kpiTypeId);
}
}
src/main/java/com/hp/cmsz/service/analysissupport/QualityRuleService.java
View file @ 25299f62
package com.hp.cmsz.service.analysissupport; package com.hp.cmsz.service.analysissupport;
import java.sql.Timestamp;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -7,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -7,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.hp.cmsz.entity.QualityRule;
import com.hp.cmsz.repository.QualityRuleDao; import com.hp.cmsz.repository.QualityRuleDao;
/** /**
...@@ -21,6 +23,11 @@ public class QualityRuleService { ...@@ -21,6 +23,11 @@ public class QualityRuleService {
@Autowired @Autowired
private QualityRuleDao qualityRuleDao; private QualityRuleDao qualityRuleDao;
//根据筛选条件查询出质量规则
public List<QualityRule> getAllQualityRuleByOther(Long[] province,Long[] datasource,Long[] channel,Long[] business){
return qualityRuleDao.findByProvinceIdInAndBusinessIdInAndDataSourceIdInAndChannelIdInOrderByQualityRuleIdDesc(province, business, datasource, channel);
}
//根据质量规则ID删除质量规则 //根据质量规则ID删除质量规则
@Transactional(readOnly=false) @Transactional(readOnly=false)
public void deleteByQualityRuleId(List<Long> qualityRuleId){ public void deleteByQualityRuleId(List<Long> qualityRuleId){
...@@ -29,8 +36,8 @@ public class QualityRuleService { ...@@ -29,8 +36,8 @@ public class QualityRuleService {
//根据质量规则ID修改质量规则 //根据质量规则ID修改质量规则
@Transactional(readOnly=false) @Transactional(readOnly=false)
public void updateByQualityRuleId(Long businessId, Long kpiId, Long channelId, Long provinceId, Long dataSourceId, String kpiMonitorTime,String kpiMonitorRange,double integrityThresholdValue,Long timelinessThresholdValue ,Date ruleCrtTime,Date ruleUpdateTime,Long qualityRuleId){ public void updateByQualityRuleId(Long businessId, Long kpiId, Long channelId, Long provinceId, Long dataSourceId, String kpiMonitorTime,String kpiMonitorRunTime,String businessTime,Date ruleCrtTime,Date ruleUpdateTime,Long qualityRuleId){
qualityRuleDao.updateQualityRuleByQualityRuleId(businessId, kpiId, channelId, provinceId, dataSourceId, kpiMonitorTime, kpiMonitorRange, integrityThresholdValue, timelinessThresholdValue, ruleCrtTime, ruleUpdateTime, qualityRuleId); qualityRuleDao.updateQualityRuleByQualityRuleId(businessId, kpiId, channelId, provinceId, dataSourceId, kpiMonitorTime, kpiMonitorRunTime, businessTime, ruleCrtTime, ruleUpdateTime, qualityRuleId);
} }
} }
src/main/java/com/hp/cmsz/web/PageURLController.java
View file @ 25299f62
package com.hp.cmsz.web; package com.hp.cmsz.web;
/** /**
* PageURLController类控制整个项目中所有页面对应的URL * PageURLController类控制整个项目中所有页面对应的URL
* @author Zhang Wei * @author Zhang Wei
* *
*/ */
public class PageURLController { public class PageURLController {
//首页 //首页
//通过index映射到WEB-INF/views下的index.jsp页面 //通过index映射到WEB-INF/views下的index.jsp页面
public static String index="index"; public static String index="index";
//add by Huach for 4A on 20140804 begin //add by Huach for 4A on 20140804 begin
public static final String AUTO_LOGIN_PAGE="AutoLogin";//"forward:/index";/ public static final String AUTO_LOGIN_PAGE="AutoLogin";//"forward:/index";/
//add by Huach for 4A on 20140804 end //add by Huach for 4A on 20140804 end
//分析支撑下的业务特征分析下的地市热点 //分析支撑下的业务特征分析下的地市热点
//通过ServiceFeatureAnalysis映射到WEB-INF/views下的AnalysisSupport/ServiceFeatureAnalysis.jsp页面 //通过ServiceFeatureAnalysis映射到WEB-INF/views下的AnalysisSupport/ServiceFeatureAnalysis.jsp页面
public static String ServiceFeatureAnalysis="AnalysisSupport/ServiceFeatureAnalysis"; public static String ServiceFeatureAnalysis="AnalysisSupport/ServiceFeatureAnalysis";
//分析支撑下的业务特征分析下的渠道热点 |author:guo xuan //分析支撑下的业务特征分析下的渠道热点 |author:guo xuan
//通过ChannelAnalysis映射到WEB-INF/views下的AnalysisSupport/ChannelAnalysis.jsp页面 //通过ChannelAnalysis映射到WEB-INF/views下的AnalysisSupport/ChannelAnalysis.jsp页面
public static String ChannelAnalysis="AnalysisSupport/ChannelAnalysis"; public static String ChannelAnalysis="AnalysisSupport/ChannelAnalysis";
//分析支撑下的竞品分析 |author:Sophia //分析支撑下的竞品分析 |author:Sophia
//通过JpfxAnalysis映射到WEB-INF/views下的AnalysisSupport/JpfxAnalysis.jsp页面 //通过JpfxAnalysis映射到WEB-INF/views下的AnalysisSupport/JpfxAnalysis.jsp页面
public static String JpfxAnalysis="AnalysisSupport/JpfxAnalysis"; public static String JpfxAnalysis="AnalysisSupport/JpfxAnalysis";
//分析支撑下的集成商分析 //分析支撑下的集成商分析
//通过ProviderAnalysis映射到WEB-INF/views下的AnalysisSupport/ProviderAnalysis.jsp页面 //通过ProviderAnalysis映射到WEB-INF/views下的AnalysisSupport/ProviderAnalysis.jsp页面
public static String ProviderAnalysis="AnalysisSupport/ProviderAnalysis"; public static String ProviderAnalysis="AnalysisSupport/ProviderAnalysis";
//分析支撑下的集成商预警分析 //分析支撑下的集成商预警分析
//通过ProviderAnalysis映射到WEB-INF/views下的AnalysisSupport/ProviderEWarningAnalysis.jsp页面 //通过ProviderAnalysis映射到WEB-INF/views下的AnalysisSupport/ProviderEWarningAnalysis.jsp页面
public static String ProviderEWarningAnalysis="AnalysisSupport/ProviderEWarningAnalysis"; public static String ProviderEWarningAnalysis="AnalysisSupport/ProviderEWarningAnalysis";
//监控运营下的预警隐患图片展示 //监控运营下的预警隐患图片展示
//ImgDisplay映射到WEB-INF/views下的MonitorOperation/ImgDisplay.jsp页面 //ImgDisplay映射到WEB-INF/views下的MonitorOperation/ImgDisplay.jsp页面
public static String ImgDisplay="MonitorOperation/ImgDisplay"; public static String ImgDisplay="MonitorOperation/ImgDisplay";
//监控运营下的告警分析 //监控运营下的告警分析
//WarnAnalysis映射到WEB-INF/views下的MonitorOperation/WarnAnalysis.jsp页面 //WarnAnalysis映射到WEB-INF/views下的MonitorOperation/WarnAnalysis.jsp页面
public static String WarnAnalysis="MonitorOperation/WarnAnalysis"; public static String WarnAnalysis="MonitorOperation/WarnAnalysis";
//监控运营下的告警明细 页面 |author:Charmy //监控运营下的告警明细 页面 |author:Charmy
//WarnAnalysis映射到WEB-INF/views下的MonitorOperation/WarnAnalysisDetail.jsp页面 //WarnAnalysis映射到WEB-INF/views下的MonitorOperation/WarnAnalysisDetail.jsp页面
public static String WarnAnalysisDetail="MonitorOperation/WarnAnalysisDetail"; public static String WarnAnalysisDetail="MonitorOperation/WarnAnalysisDetail";
//监控运营下的协查单分析 //监控运营下的协查单分析
//WarnAnalysis映射到WEB-INF/views下的MonitorOperation/WorkingOrderAnalysis.jsp页面 //WarnAnalysis映射到WEB-INF/views下的MonitorOperation/WorkingOrderAnalysis.jsp页面
public static String WorkingOrderAnalysis="MonitorOperation/WorkingOrderAnalysis"; public static String WorkingOrderAnalysis="MonitorOperation/WorkingOrderAnalysis";
//监控运营下的故障页面 | author:August //监控运营下的故障页面 | author:August
//监控运营下的故障分析 //监控运营下的故障分析
//WarnAnalysis映射到WEB-INF/views下的MonitorOperation/WarnAnalysis.jsp页面 //WarnAnalysis映射到WEB-INF/views下的MonitorOperation/WarnAnalysis.jsp页面
public static String FailureAnalysis="MonitorOperation/FailureAnalysis"; public static String FailureAnalysis="MonitorOperation/FailureAnalysis";
//监控运营下的故障明细 //监控运营下的故障明细
//FailureAnalysisDetail映射到WEB-INF/views下的MonitorOperation/FailureAnalysisDetail.jsp页面 //FailureAnalysisDetail映射到WEB-INF/views下的MonitorOperation/FailureAnalysisDetail.jsp页面
public static String FailureAnalysisDetail="MonitorOperation/FailureAnalysisDetail"; public static String FailureAnalysisDetail="MonitorOperation/FailureAnalysisDetail";
//监控运营下的故障明细/MonitorOperation/FailureAnalysisXcd //监控运营下的故障明细/MonitorOperation/FailureAnalysisXcd
//FailureAnalysisXcd映射到WEB-INF/views下的MonitorOperation/FailureAnalysisXcd.jsp页面 //FailureAnalysisXcd映射到WEB-INF/views下的MonitorOperation/FailureAnalysisXcd.jsp页面
public static String FailureAnalysisXcd="MonitorOperation/FailureAnalysisXcd"; public static String FailureAnalysisXcd="MonitorOperation/FailureAnalysisXcd";
//监控运营下的故障明细/MonitorOperation/FailureAnalysisXcdChange //监控运营下的故障明细/MonitorOperation/FailureAnalysisXcdChange
//FailureAnalysisXcdChange映射到WEB-INF/views下的MonitorOperation/FailureAnalysisXcd.jsp页面 //FailureAnalysisXcdChange映射到WEB-INF/views下的MonitorOperation/FailureAnalysisXcd.jsp页面
public static String FailureAnalysisXcdChange="MonitorOperation/FailureAnalysisXcdChange"; public static String FailureAnalysisXcdChange="MonitorOperation/FailureAnalysisXcdChange";
//监控运营下的故障明细展示 //监控运营下的故障明细展示
//FailureAnalysisDetailDisplay映射到WEB-INF/views下的MonitorOperation/FailureAnalysisDetailDisplay.jsp页面 //FailureAnalysisDetailDisplay映射到WEB-INF/views下的MonitorOperation/FailureAnalysisDetailDisplay.jsp页面
public static String FailureAnalysisDetailDisplay="MonitorOperation/FailureAnalysisDetailDisplay"; public static String FailureAnalysisDetailDisplay="MonitorOperation/FailureAnalysisDetailDisplay";
//监控运营下的故障创建 //监控运营下的故障创建
//FailureCreate映射到WEB-INF/views下的MonitorOperation/FailureCreate.jsp页面 //FailureCreate映射到WEB-INF/views下的MonitorOperation/FailureCreate.jsp页面
public static String FailureCreate="MonitorOperation/FailureCreate"; public static String FailureCreate="MonitorOperation/FailureCreate";
//分析支撑下的集成商分析 //分析支撑下的集成商分析
//通过ProviderAnalysis映射到WEB-INF/views下的AnalysisSupport/ProviderFailureAnalysis.jsp页面 //通过ProviderAnalysis映射到WEB-INF/views下的AnalysisSupport/ProviderFailureAnalysis.jsp页面
public static String ProviderFailureAnalysis="AnalysisSupport/ProviderFailureAnalysis"; public static String ProviderFailureAnalysis="AnalysisSupport/ProviderFailureAnalysis";
//author:Ma Wenmeng //author:Ma Wenmeng
//通过RegularityAnalysis映射到WEB-INF/views下的MonitorOperation/RegularityAnalysis.jsp页面 //通过RegularityAnalysis映射到WEB-INF/views下的MonitorOperation/RegularityAnalysis.jsp页面
public static String RegularityAnalysis="MonitorOperation/RegularityAnalysis"; public static String RegularityAnalysis="MonitorOperation/RegularityAnalysis";
//监控运营下的业务规律分析 //监控运营下的业务规律分析
//通过RegularityAnalysis映射到WEB-INF/views下的MonitorOperation/FailureForcast.jsp页面 //通过RegularityAnalysis映射到WEB-INF/views下的MonitorOperation/FailureForcast.jsp页面
public static String FailureForcast="MonitorOperation/FailureForcast"; public static String FailureForcast="MonitorOperation/FailureForcast";
//监控运营下的业务规律分析 //监控运营下的业务规律分析
//author:guo xuan //author:guo xuan
//通过KeyLinkProcessAnalysis映射到WEB-INF/views下的MonitorOperation/KeyLinkProcessAnalysis.jsp页面 //通过KeyLinkProcessAnalysis映射到WEB-INF/views下的MonitorOperation/KeyLinkProcessAnalysis.jsp页面
public static String KeyLinkProcessAnalysis="MonitorOperation/KeyLinkProcessAnalysis"; public static String KeyLinkProcessAnalysis="MonitorOperation/KeyLinkProcessAnalysis";
//监控运营下的业务规律分析 //监控运营下的业务规律分析
//author:guo xuan //author:guo xuan
//通过LocationProblemAnalysis映射到WEB-INF/views下的MonitorOperation/LocationProblemAnalysis.jsp页面 //通过LocationProblemAnalysis映射到WEB-INF/views下的MonitorOperation/LocationProblemAnalysis.jsp页面
public static String LocationProblemAnalysis="MonitorOperation/LocationProblemAnalysis"; public static String LocationProblemAnalysis="MonitorOperation/LocationProblemAnalysis";
//监控运营下的业务规律分析 //监控运营下的业务规律分析
//author:guo xuan //author:guo xuan
//通过RelationalAnalysis映射到WEB-INF/views下的MonitorOperation/RelationalAnalysis.jsp页面 //通过RelationalAnalysis映射到WEB-INF/views下的MonitorOperation/RelationalAnalysis.jsp页面
public static String RelationalAnalysis="MonitorOperation/RelationalAnalysis"; public static String RelationalAnalysis="MonitorOperation/RelationalAnalysis";
// author :wangfeng 开始 // author :wangfeng 开始
//监控运营下的协查单管理 //监控运营下的协查单管理
//WorkingOrderManage映射到WEB-INF/views下的MonitorOperation/WorkingOrderManage.jsp页面 //WorkingOrderManage映射到WEB-INF/views下的MonitorOperation/WorkingOrderManage.jsp页面
public static String WorkingOrderManage="MonitorOperation/WorkingOrderManage"; public static String WorkingOrderManage="MonitorOperation/WorkingOrderManage";
//协查单查询结果页面 //协查单查询结果页面
//WWorkingOrderReasult映射到WEB-INF/views下的MonitorOperation/WorkingOrderReasult.jsp页面 //WWorkingOrderReasult映射到WEB-INF/views下的MonitorOperation/WorkingOrderReasult.jsp页面
public static String WorkingOrderReasult="MonitorOperation/WorkingOrderReasult"; public static String WorkingOrderReasult="MonitorOperation/WorkingOrderReasult";
//协查单查询明细展示页面 //协查单查询明细展示页面
//WorkingOrderDetail映射到WEB-INF/views下的MonitorOperation/WorkingOrderDetail.jsp页面 //WorkingOrderDetail映射到WEB-INF/views下的MonitorOperation/WorkingOrderDetail.jsp页面
public static String WorkingOrderDetail="MonitorOperation/WorkingOrderDetail"; public static String WorkingOrderDetail="MonitorOperation/WorkingOrderDetail";
//监控运营下的协查单管理 //监控运营下的协查单管理
//WorkingOrderManage映射到WEB-INF/views下的MonitorOperation/WorkingOrderCreate.jsp页面 //WorkingOrderManage映射到WEB-INF/views下的MonitorOperation/WorkingOrderCreate.jsp页面
public static String WorkingOrderCreate="MonitorOperation/WorkingOrderCreate"; public static String WorkingOrderCreate="MonitorOperation/WorkingOrderCreate";
//监控运营下的协查单管理 //监控运营下的协查单管理
//WorkingOrderManage映射到WEB-INF/views下的MonitorOperation/WorkingOrderUpdate.jsp页面 //WorkingOrderManage映射到WEB-INF/views下的MonitorOperation/WorkingOrderUpdate.jsp页面
public static String WorkingOrderUpdate="MonitorOperation/WorkingOrderUpdate"; public static String WorkingOrderUpdate="MonitorOperation/WorkingOrderUpdate";
//监控运营下的内部协查单管理 //监控运营下的内部协查单管理
//WorkingOrderManage映射到WEB-INF/views下的MonitorOperation/WorkingOrderUpdate.jsp页面 //WorkingOrderManage映射到WEB-INF/views下的MonitorOperation/WorkingOrderUpdate.jsp页面
public static String InsideXcd="MonitorOperation/InsideXcd"; public static String InsideXcd="MonitorOperation/InsideXcd";
//配置项分析 //配置项分析
//PzxAnalysis映射到WEB-INF/views下的AnalysisSupport/PzxAnalysis.jsp页面 //PzxAnalysis映射到WEB-INF/views下的AnalysisSupport/PzxAnalysis.jsp页面
public static String PzxAnalysis="AnalysisSupport/PzxAnalysis"; public static String PzxAnalysis="AnalysisSupport/PzxAnalysis";
//配置项数量统计分析 //配置项数量统计分析
//PzxNumCount映射到WEB-INF/views下的AnalysisSupport/PzxNumCount.jsp页面 //PzxNumCount映射到WEB-INF/views下的AnalysisSupport/PzxNumCount.jsp页面
public static String PzxNumCount="AnalysisSupport/PzxNumCount"; public static String PzxNumCount="AnalysisSupport/PzxNumCount";
//配置项生命周期统计分析页面 //配置项生命周期统计分析页面
//PzxAnalysisLifeCycle映射到WEB-INF/views下的AnalysisSupport/PzxAnalysisLifeCycle.jsp页面 //PzxAnalysisLifeCycle映射到WEB-INF/views下的AnalysisSupport/PzxAnalysisLifeCycle.jsp页面
public static String PzxAnalysisLifeCycle="AnalysisSupport/PzxAnalysisLifeCycle"; public static String PzxAnalysisLifeCycle="AnalysisSupport/PzxAnalysisLifeCycle";
//配置项属性统计分析页面 //配置项属性统计分析页面
//PzxAttribute映射到WEB-INF/views下的AnalysisSupport/PzxAttribute.jsp页面 //PzxAttribute映射到WEB-INF/views下的AnalysisSupport/PzxAttribute.jsp页面
public static String PzxAttribute="AnalysisSupport/PzxAttribute"; public static String PzxAttribute="AnalysisSupport/PzxAttribute";
//配置项明细统计分析 //配置项明细统计分析
//PzxDetail映射到WEB-INF/views下的AnalysisSupport/PzxDetail.jsp页面 //PzxDetail映射到WEB-INF/views下的AnalysisSupport/PzxDetail.jsp页面
public static String PzxDetail="AnalysisSupport/PzxDetail"; public static String PzxDetail="AnalysisSupport/PzxDetail";
//配置项属性明细统计分析 //配置项属性明细统计分析
//PzxAttributeDetail映射到WEB-INF/views下的AnalysisSupport/PzxAttributeDetail.jsp页面 //PzxAttributeDetail映射到WEB-INF/views下的AnalysisSupport/PzxAttributeDetail.jsp页面
public static String PzxAttributeDetail="AnalysisSupport/PzxAttributeDetail"; public static String PzxAttributeDetail="AnalysisSupport/PzxAttributeDetail";
//数据管理 //数据管理
public static String AdHocQueries ="DataManage/AdHocQueries"; public static String AdHocQueries ="DataManage/AdHocQueries";
public static String KnowledgeShare = "DataManage/KnowledgeShare"; public static String KnowledgeShare = "DataManage/KnowledgeShare";
public static String KnowledgeUpdate = "DataManage/KnowledgeUpdate"; public static String KnowledgeUpdate = "DataManage/KnowledgeUpdate";
public static String KnowledgeCreate = "DataManage/KnowledgeCreate"; public static String KnowledgeCreate = "DataManage/KnowledgeCreate";
//分析建模 //分析建模
public static String ModelMaintain = "ModelManage/ModelMaintain"; public static String ModelMaintain = "ModelManage/ModelMaintain";
public static String ModelResult = "ModelManage/ModelResult"; public static String ModelResult = "ModelManage/ModelResult";
public static String ModelParameterConfiguration = "ModelManage/ModelParameterConfiguration"; public static String ModelParameterConfiguration = "ModelManage/ModelParameterConfiguration";
public static String ModelMonitor ="ModelManage/ModelMonitor"; public static String ModelMonitor ="ModelManage/ModelMonitor";
//运营支撑下的数据质量核查 //运营支撑下的数据质量核查
public static String RuleResult = "AnalysisSupport/QualityRuleResult"; public static String RuleResult = "AnalysisSupport/QualityRuleResult";
public static String RuleMaintain = "AnalysisSupport/QualityRuleMaintain"; public static String RuleMaintain = "AnalysisSupport/QualityRuleMaintain";
public static String RuleConfiguration = "AnalysisSupport/QualityRuleConfiguration"; public static String RuleConfiguration = "AnalysisSupport/QualityRuleConfiguration";
public static String FilterResult = "AnalysisSupport/FilterRuleResult"; public static String FilterResult = "AnalysisSupport/FilterRuleResult";
public static String FilterMaintain = "AnalysisSupport/FilterRuleMaintain"; public static String FilterMaintain = "AnalysisSupport/FilterRuleMaintain";
public static String FilterConfiguration = "AnalysisSupport/FilterRuleConfiguration"; public static String FilterConfiguration = "AnalysisSupport/FilterRuleConfiguration";
//基础管理 //基础管理
//AuthorityManage映射到WEB-INF/views下的AuthorityManage/AuthorityManage.jsp页面 //AuthorityManage映射到WEB-INF/views下的AuthorityManage/AuthorityManage.jsp页面
public static String AuthorityManage="AuthorityManage/AuthorityManage"; public static String AuthorityManage="AuthorityManage/AuthorityManage";
//Add by Huach on 20140715 begin //Add by Huach on 20140715 begin
public final static String FOUR_A_SERVICE_LIST="AuthorityManage/ServiceList"; public final static String FOUR_A_SERVICE_LIST="AuthorityManage/ServiceList";
//Add by Huach on 20140715 end //Add by Huach on 20140715 end
//RoleManage映射到WEB-INF/views下的AuthorityManage/RoleManage.jsp页面 //RoleManage映射到WEB-INF/views下的AuthorityManage/RoleManage.jsp页面
public static String RoleManage="AuthorityManage/RoleManage"; public static String RoleManage="AuthorityManage/RoleManage";
//修改密码 //修改密码
public static String ModifyPassword = "AuthorityManage/ModifyPassword"; public static String ModifyPassword = "AuthorityManage/ModifyPassword";
// author :sun hao 开始 // author :sun hao 开始
public static String TaskHome = "TaskManage/TaskHome"; public static String TaskHome = "TaskManage/TaskHome";
public static String TaskDetailList = "TaskManage/TaskDetailList"; public static String TaskDetailList = "TaskManage/TaskDetailList";
public static String TaskDetailForm = "TaskManage/TaskDetailForm"; public static String TaskDetailForm = "TaskManage/TaskDetailForm";
public static String RunTaskList = "TaskManage/RunTaskList"; public static String RunTaskList = "TaskManage/RunTaskList";
public static String RunTaskForm = "TaskManage/RunTaskForm"; public static String RunTaskForm = "TaskManage/RunTaskForm";
public static String RunTaskLogList = "TaskManage/RunTaskLogList"; public static String RunTaskLogList = "TaskManage/RunTaskLogList";
public static String ParameterHome = "ParameterManage/ParameterHome"; public static String ParameterHome = "ParameterManage/ParameterHome";
public static String EWarningDropRuleList = "ParameterManage/EWarningDropRuleList"; public static String EWarningDropRuleList = "ParameterManage/EWarningDropRuleList";
public static String EWarningDropRuleForm = "ParameterManage/EWarningDropRuleForm"; public static String EWarningDropRuleForm = "ParameterManage/EWarningDropRuleForm";
public static String EWarningRuleList = "ParameterManage/EWarningRuleList"; public static String EWarningRuleList = "ParameterManage/EWarningRuleList";
public static String EWarningRuleForm = "ParameterManage/EWarningRuleForm"; public static String EWarningRuleForm = "ParameterManage/EWarningRuleForm";
public static String HWarningRuleList = "ParameterManage/HWarningRuleList"; public static String HWarningRuleList = "ParameterManage/HWarningRuleList";
public static String HWarningRuleForm = "ParameterManage/HWarningRuleForm"; public static String HWarningRuleForm = "ParameterManage/HWarningRuleForm";
public static String MonitorHome = "SelfMonitor/MonitorHome"; public static String MonitorHome = "SelfMonitor/MonitorHome";
public static String HadoopConfig = "SelfMonitor/HadoopConfig"; public static String HadoopConfig = "SelfMonitor/HadoopConfig";
public static String VerticaConfig = "SelfMonitor/VerticaConfig"; public static String VerticaConfig = "SelfMonitor/VerticaConfig";
public static String TaskDetailListDetail = "TaskManage/TaskDetailListDetail"; public static String TaskDetailListDetail = "TaskManage/TaskDetailListDetail";
public static String RunTaskListTable = "TaskManage/RunTaskListTable"; public static String RunTaskListTable = "TaskManage/RunTaskListTable";
public static String RunTaskLogListTable = "TaskManage/RunTaskLogListTable"; public static String RunTaskLogListTable = "TaskManage/RunTaskLogListTable";
public static String EWarningDropRuleListTable = "ParameterManage/EWarningDropRuleListTable"; public static String EWarningDropRuleListTable = "ParameterManage/EWarningDropRuleListTable";
public static String EWarningRuleListTable = "ParameterManage/EWarningRuleListTable"; public static String EWarningRuleListTable = "ParameterManage/EWarningRuleListTable";
public static String HWarningRuleListTable = "ParameterManage/HWarningRuleListTable"; public static String HWarningRuleListTable = "ParameterManage/HWarningRuleListTable";
public static String DataBackupHome = "DataBackup/DataBackupHome"; public static String DataBackupHome = "DataBackup/DataBackupHome";
public static String DataBackupList = "DataBackup/DataBackupList"; public static String DataBackupList = "DataBackup/DataBackupList";
public static String DataBackupListTable = "DataBackup/DataBackupListTable"; public static String DataBackupListTable = "DataBackup/DataBackupListTable";
public static String DataBackupForm = "DataBackup/DataBackupForm"; public static String DataBackupForm = "DataBackup/DataBackupForm";
public static String RuleHome = "ParameterManage/RuleHome"; public static String RuleHome = "ParameterManage/RuleHome";
public static String DataRecoverHome = "ParameterManage/DataRecoverHome"; public static String DataRecoverHome = "ParameterManage/DataRecoverHome";
public static String SetupManageHome = "SetupManage/SetupManageHome"; public static String SetupManageHome = "SetupManage/SetupManageHome";
public static String SystemParameterHome = "SetupManage/SystemParameterHome"; public static String SystemParameterHome = "SetupManage/SystemParameterHome";
public static String SystemParameterList = "SetupManage/SystemParameterList"; public static String SystemParameterList = "SetupManage/SystemParameterList";
public static String SystemParameterListTable = "SetupManage/SystemParameterListTable"; public static String SystemParameterListTable = "SetupManage/SystemParameterListTable";
public static String SystemParameterForm = "SetupManage/SystemParameterForm"; public static String SystemParameterForm = "SetupManage/SystemParameterForm";
public static String AnalysisTypeHome = "SetupManage/AnalysisTypeHome"; public static String AnalysisTypeHome = "SetupManage/AnalysisTypeHome";
public static String AnalysisTypeList = "SetupManage/AnalysisTypeList"; public static String AnalysisTypeList = "SetupManage/AnalysisTypeList";
public static String AnalysisTypeListTable = "SetupManage/AnalysisTypeListTable"; public static String AnalysisTypeListTable = "SetupManage/AnalysisTypeListTable";
public static String AnalysisTypeForm = "SetupManage/AnalysisTypeForm"; public static String AnalysisTypeForm = "SetupManage/AnalysisTypeForm";
public static String BaseDataList = "SetupManage/BaseDataList"; public static String BaseDataList = "SetupManage/BaseDataList";
public static String BaseDataListTable = "SetupManage/BaseDataListTable"; public static String BaseDataListTable = "SetupManage/BaseDataListTable";
public static String BaseDataForm = "SetupManage/BaseDataForm"; public static String BaseDataForm = "SetupManage/BaseDataForm";
public static String ModelMonitorHome = "TaskManage/ModelMonitorHome"; public static String ModelMonitorHome = "TaskManage/ModelMonitorHome";
public static String SandboxHome = "TaskManage/SandboxHome"; public static String SandboxHome = "TaskManage/SandboxHome";
public static String TaskGroupList = "SetupManage/TaskGroupList"; public static String TaskGroupList = "SetupManage/TaskGroupList";
public static String TaskGroupListTable = "SetupManage/TaskGroupListTable"; public static String TaskGroupListTable = "SetupManage/TaskGroupListTable";
public static String TaskGroupForm = "SetupManage/TaskGroupForm"; public static String TaskGroupForm = "SetupManage/TaskGroupForm";
public static String DeployedServerList = "SetupManage/DeployedServerList"; public static String DeployedServerList = "SetupManage/DeployedServerList";
public static String DeployedServerListTable = "SetupManage/DeployedServerListTable"; public static String DeployedServerListTable = "SetupManage/DeployedServerListTable";
public static String DeployedServerForm = "SetupManage/DeployedServerForm"; public static String DeployedServerForm = "SetupManage/DeployedServerForm";
public static String DataModelTypeList = "SetupManage/DataModelTypeList"; public static String DataModelTypeList = "SetupManage/DataModelTypeList";
public static String DataModelTypeListTable = "SetupManage/DataModelTypeListTable"; public static String DataModelTypeListTable = "SetupManage/DataModelTypeListTable";
public static String DataModelTypeForm = "SetupManage/DataModelTypeForm"; public static String DataModelTypeForm = "SetupManage/DataModelTypeForm";
// author :sun hao 结束 // author :sun hao 结束
} }
src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleConfigurationController.java
View file @ 25299f62
package com.hp.cmsz.web.analysissupport; package com.hp.cmsz.web.analysissupport;
import java.text.ParseException; import java.text.ParseException;
import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import com.google.gson.Gson;
import com.hp.cmsz.entity.AccuracyRule;
import com.hp.cmsz.entity.Business;
import com.hp.cmsz.entity.Channel;
import com.hp.cmsz.entity.DataSource;
import com.hp.cmsz.entity.DataType;
import com.hp.cmsz.entity.Kpi;
import com.hp.cmsz.entity.Province;
import com.hp.cmsz.entity.QualityRule;
import com.hp.cmsz.repository.AccuracyRuleDao;
import com.hp.cmsz.repository.BusinessDao;
import com.hp.cmsz.repository.ChannelDao;
import com.hp.cmsz.repository.DataSourceDao;
import com.hp.cmsz.repository.DataTypeDao;
import com.hp.cmsz.repository.KpiDao;
import com.hp.cmsz.repository.ProvinceDao;
import com.hp.cmsz.repository.QualityRuleDao;
import com.hp.cmsz.service.analysissupport.AccuracyRuleService;
import com.hp.cmsz.web.PageURLController; import com.hp.cmsz.web.PageURLController;
/** /**
...@@ -22,6 +46,109 @@ import com.hp.cmsz.web.PageURLController; ...@@ -22,6 +46,109 @@ import com.hp.cmsz.web.PageURLController;
@RequestMapping(value="AnalysisSupport/QualityRuleConfiguration") @RequestMapping(value="AnalysisSupport/QualityRuleConfiguration")
public class QualityRuleConfigurationController { public class QualityRuleConfigurationController {
// @Autowired
// private ProvinceDao provinceDao;
//
// @Autowired
// private ChannelDao channelDao;
//
// @Autowired
// private BusinessDao businessDao;
//
// @Autowired
// private KpiDao kpiDao;
//
// @Autowired
// private DataTypeDao dataTypeDao;
//
// @Autowired
// private DataSourceDao dataSourceDao;
//
// @Autowired
// private QualityRuleDao qualityRuleDao;
//
//// @Autowired
//// private QualityRuleService qualityRuleService;
//
// @Autowired
// private AccuracyRuleDao accuracyRuleDao;
//
// @Autowired
// private AccuracyRuleService accuracyRuleService;
////
//// @Autowired
//// private CmszOperationLogService cmszOperationLogService;
//
// @RequestMapping(value = "")
// public String ruleMaintainHome(@RequestParam(value = "qualityRuleId", defaultValue ="") String qualityRuleId,
// Map model){
//
// QualityRule qualityRule = null;
// List<AccuracyRule> accuracyRuleList = null;
// if(!qualityRuleId.trim().equals("")){
// qualityRule = qualityRuleDao.findByQualityRuleId(Long.parseLong(qualityRuleId));
// accuracyRuleList = accuracyRuleDao.findByQualityRuleId(Long.parseLong(qualityRuleId));
// }
//
// //查询出所有的省份
// List<Province> provinceList=(List<Province>)provinceDao.findProvince();
// //查询出所有的渠道信息
// List<Channel> channelList=(List<Channel>)channelDao.findChannelWithoutAll();
// //查询出所有的指标
// List<Kpi> kpiList=(List<Kpi>)kpiDao.findAll();
// //查询出所有的业务
// List<Business> businessList=(List<Business>)businessDao.findAll();
// //查询出所有的数据类型
// List<DataType> dataTypeList= (List<DataType>)dataTypeDao.findAll();
// //查询出所有的数据来源
// List<DataSource> dataSourceList=(List<DataSource>)dataSourceDao.findAll();
// Gson gson = new Gson();
// model.put("provinceList", provinceList);
// model.put("channelList", channelList);
// model.put("kpiList", kpiList);
// model.put("businessList", gson.toJson(businessList));
// model.put("dataTypeList", dataTypeList);
// model.put("dataSourceList", dataSourceList);
//
// return PageURLController.RuleConfiguration;
// }
//
// //修改准确性规则信息
// @RequestMapping(value = "/updateAccuracyRule*",method=RequestMethod.GET)
// @ResponseBody
// public void updateParameter(
// @RequestParam(value="ruleType") String ruleType,
// @RequestParam(value="scopeMaxValue") double scopeMaxValue,
// @RequestParam(value="scopeMinValue") double scopeMinValue,
// @RequestParam(value="repeatedCheckGranularity") String repeatedCheckGranularity,
// @RequestParam(value="repeatedCheckStartTime") Date repeatedCheckStartTime,
// @RequestParam(value="repeatedCheckEndTime") Date repeatedCheckEndTime,
// @RequestParam(value="ifRepeatedCheckSeries") String ifRepeatedCheckSeries,
// @RequestParam(value="repeatedCheckMaxTime") Long repeatedCheckMaxTime,
// @RequestParam(value="ifRepeatedCheckSummation") String ifRepeatedCheckSummation,
// @RequestParam(value="qualityRuleId")String qualityRuleId,
// @RequestParam(value="accuracyRuleId")String accuracyRuleId){
//
// if(qualityRuleId.trim().equals("")){
// AccuracyRule accuracyRule = new AccuracyRule();
// accuracyRule.setAccuracyRuleId(Long.parseLong(qualityRuleId));
// accuracyRule.setRuleType(ruleType);
// accuracyRule.setScopeMinValue(scopeMaxValue);
// accuracyRule.setScopeMinValue(scopeMinValue);
// accuracyRule.setRepeatedCheckGranularity(repeatedCheckGranularity);
// accuracyRule.setRepeatedCheckStartTime(repeatedCheckStartTime);
// accuracyRule.setRepeatedCheckEndTime(repeatedCheckEndTime);
// accuracyRule.setIfRepeatedCheckSeries(ifRepeatedCheckSeries);
// accuracyRule.setRepeatedCheckMaxTime(repeatedCheckMaxTime);
// accuracyRule.setIfRepeatedCheckSummation(ifRepeatedCheckSummation);
//
// accuracyRuleDao.save(accuracyRule);
// }else{
// accuracyRuleService.updateAccuracyRuleByAccuracyRuleId(ruleType, scopeMaxValue, scopeMinValue, repeatedCheckGranularity, repeatedCheckStartTime, repeatedCheckEndTime, ifRepeatedCheckSeries, repeatedCheckMaxTime, ifRepeatedCheckSummation, Long.parseLong(accuracyRuleId));;
// }
//
// }
@RequestMapping() @RequestMapping()
public String updateQualityRuleForm() { public String updateQualityRuleForm() {
......
src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleMaintainController.java
View file @ 25299f62
package com.hp.cmsz.web.analysissupport; package com.hp.cmsz.web.analysissupport;
import java.io.IOException;
import java.io.PrintWriter;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -11,13 +13,18 @@ import javax.servlet.http.HttpServletRequest; ...@@ -11,13 +13,18 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.google.gson.Gson;
import com.hp.cmsz.entity.Business;
import com.hp.cmsz.entity.Channel; import com.hp.cmsz.entity.Channel;
import com.hp.cmsz.entity.ChannelDataSourceMap;
import com.hp.cmsz.entity.DataModel; import com.hp.cmsz.entity.DataModel;
import com.hp.cmsz.entity.DataSource; import com.hp.cmsz.entity.DataSource;
import com.hp.cmsz.entity.DataType; import com.hp.cmsz.entity.DataType;
...@@ -27,6 +34,7 @@ import com.hp.cmsz.entity.Province; ...@@ -27,6 +34,7 @@ import com.hp.cmsz.entity.Province;
import com.hp.cmsz.repository.AccuracyRuleDao; import com.hp.cmsz.repository.AccuracyRuleDao;
import com.hp.cmsz.repository.BusinessDao; import com.hp.cmsz.repository.BusinessDao;
import com.hp.cmsz.repository.ChannelDao; import com.hp.cmsz.repository.ChannelDao;
import com.hp.cmsz.repository.ChannelDataSourceMapDao;
import com.hp.cmsz.repository.DataSourceDao; import com.hp.cmsz.repository.DataSourceDao;
import com.hp.cmsz.repository.DataTypeDao; import com.hp.cmsz.repository.DataTypeDao;
import com.hp.cmsz.repository.KpiDao; import com.hp.cmsz.repository.KpiDao;
...@@ -34,6 +42,7 @@ import com.hp.cmsz.repository.ProvinceDao; ...@@ -34,6 +42,7 @@ import com.hp.cmsz.repository.ProvinceDao;
import com.hp.cmsz.repository.QualityRuleDao; import com.hp.cmsz.repository.QualityRuleDao;
import com.hp.cmsz.service.BusinessService; import com.hp.cmsz.service.BusinessService;
import com.hp.cmsz.service.CmszOperationLogService; import com.hp.cmsz.service.CmszOperationLogService;
import com.hp.cmsz.service.KpiService;
import com.hp.cmsz.service.analysissupport.QualityRuleService; import com.hp.cmsz.service.analysissupport.QualityRuleService;
import com.hp.cmsz.web.PageURLController; import com.hp.cmsz.web.PageURLController;
...@@ -55,9 +64,15 @@ public class QualityRuleMaintainController { ...@@ -55,9 +64,15 @@ public class QualityRuleMaintainController {
private ChannelDao channelDao; private ChannelDao channelDao;
@Autowired @Autowired
private ChannelDataSourceMapDao channelDataSourceMapDao;
@Autowired
private BusinessService businessService; private BusinessService businessService;
@Autowired @Autowired
private BusinessDao businessDao;
@Autowired
private KpiDao kpiDao; private KpiDao kpiDao;
@Autowired @Autowired
...@@ -88,89 +103,182 @@ public class QualityRuleMaintainController { ...@@ -88,89 +103,182 @@ public class QualityRuleMaintainController {
//查询出所有的指标 //查询出所有的指标
List<Kpi> kpiList=(List<Kpi>)kpiDao.findAll(); List<Kpi> kpiList=(List<Kpi>)kpiDao.findAll();
//查询出所有的业务 //查询出所有的业务
List<String> businessList=businessService.getAllBusinessIdAndBusinessName(); List<Object[]> businessList=(List<Object[]>)businessDao.findAllBusinessIdAndBusinessName();
//查询出所有的数据类型 //查询出所有的数据类型
List<DataType> dataTypeList= (List<DataType>)dataTypeDao.findAll(); List<DataType> dataTypeList= (List<DataType>)dataTypeDao.findAll();
//查询出所有的数据来源 //查询出所有的数据来源
List<DataSource> dataSourceList=(List<DataSource>)dataSourceDao.findAll(); List<DataSource> dataSourceList=(List<DataSource>)dataSourceDao.findAll();
Gson gson = new Gson();
model.put("provinceList", provinceList); model.put("provinceList", provinceList);
model.put("channelList", channelList); model.put("channelList", channelList);
model.put("kpiList", kpiList); model.put("kpiList", kpiList);
model.put("businessList", businessList); model.put("businessList", gson.toJson(businessList));
model.put("dataTypeList", dataTypeList); model.put("dataTypeList", dataTypeList);
model.put("dataSourceList", dataSourceList); model.put("dataSourceList", dataSourceList);
return PageURLController.RuleMaintain; return PageURLController.RuleMaintain;
} }
@RequestMapping(value = "/findBusinessId*")
@ResponseBody
public void datasource_select(@RequestParam(value = "dataSource", defaultValue ="" ) String dataSource,
@RequestParam(value = "channel", defaultValue ="" ) String channel,
HttpServletResponse response) {
System.out.println(dataSource);
List<Object []> resultList = new ArrayList<Object []>();
List<Object[]> list = (List<Object[]>)businessDao.findBusinessIdAndBusinessNameByDataSourceIdAndChannelIdWithIsActive(Long.parseLong(channel),Long.parseLong(dataSource));
for(int i=0;i<list.size();i++){
Object[] objs = list.get(i);
//将重复的业务名的Id写在同一个对象中
for(int j=0;j<list.size();j++){
if(i == j){}else{
Object[] objs1 = list.get(j);
if(objs[1].equals(objs1[1])){
objs[0] = objs[0] +","+ objs1[0];
list.remove(j);
j--;
}
}
}
resultList.add(objs);
}
Gson gson = new Gson();
response.setContentType("text/Xml;chartset=gbk");
PrintWriter out = null;
try{
out = response.getWriter();
out.println(gson.toJson(resultList));
}
catch(IOException ex){
ex.printStackTrace();
}
finally{
out.close();
}
}
// @RequestMapping(value="/findBusinessId*")
// @ResponseBody
// public void findBusinessId(@RequestParam(value = "dataSource", defaultValue ="" ) String dataSource,
// @RequestParam(value = "channelId", defaultValue ="" ) String channelId,
// HttpServletResponse response){
// List<Object[]> channelDataSourceMapIdList = (List<Object[]>)businessDao.findBusinessIdAndBusinessNameByDataSourceIdAndChannelIdWithIsActive(Long.parseLong(dataSource),Long.parseLong(channel));
// Gson gson = new Gson();
// response.setContentType("text/Xml;charset=gbk");
// PrintWriter out = null;
// try {
// out = response.getWriter();
// out.println(gson.toJson(dataSceAndBus));
// }
// catch (IOException ex1) {
// ex1.printStackTrace();
// }finally{ out.close(); }
// }
@RequestMapping(value="/findKpiId*")
@ResponseBody
public void findKpiId(@RequestParam(value = "businessIds", defaultValue ="" ) String businessIds,
HttpServletResponse response){
String[] strs = businessIds.split(",");
List<Long> businessIdlist = new ArrayList<Long>();
for(int i=0;i<strs.length;i++){
businessIdlist.add(Long.valueOf(strs[i]));
List<Object[]> businessKpiList = (List<Object[]>)kpiDao.findKpiIdAndKpiNameByBusinessIds(businessIdlist);
Gson gson = new Gson();
response.setContentType("text/Xml;charset=gbk");
PrintWriter out = null;
try {
out = response.getWriter();
out.println(gson.toJson(businessKpiList));
}
catch (IOException ex1) {
ex1.printStackTrace();
}finally{ out.close(); }
}
// private List<Long> qualityRuleIdList = new ArrayList<Long>(); // private List<Long> qualityRuleIdList = new ArrayList<Long>();
// //新增准确性规则 // //新增准确性规则
// @RequestMapping(value = "/createAccuracyRule*", method = RequestMethod.GET) // @RequestMapping(value = "/createAccuracyRule*", method = RequestMethod.GET)
// @ResponseBody // @ResponseBody
// public void createAccuracyRule( // public void createAccuracyRule(
// @RequestParam(value="paramName") String paramName, // @RequestParam(value="ruleType") String ruleType,
// @RequestParam(value="paramValue") String paramValue, // @RequestParam(value="scopeMaxValue") String scopeMaxValue,
// @RequestParam(value="paramType") String paramType, // @RequestParam(value="scopeMinValue") String scopeMinValue,
// @RequestParam(value="paramName") String paramName, // @RequestParam(value="repeatedCheckGranularity") String repeatedCheckGranularity,
// @RequestParam(value="paramValue") String paramValue, // @RequestParam(value="repeatedCheckStartTime") String repeatedCheckStartTime,
// @RequestParam(value="paramType") String paramType, // @RequestParam(value="repeatedCheckEndTime") String repeatedCheckEndTime,
// @RequestParam(value="paramName") String paramName, // @RequestParam(value="ifRepeatedCheckSeries") String ifRepeatedCheckSeries,
// @RequestParam(value="paramValue") String paramValue, // @RequestParam(value="repeatedCheckMaxTime") String repeatedCheckMaxTime,
// @RequestParam(value="paramType") String paramType, // @RequestParam(value="ifRepeatedCheckSummation") String ifRepeatedCheckSummation,
// HttpServletResponse response,HttpServletRequest request) { // HttpServletResponse response,HttpServletRequest request) {
// //
// ModelParameter modelParameter = new ModelParameter(); // AccuracyRule accuracyRule = new accuracyRule();
// if(!paramName.trim().equals("")){modelParameter.setParameterName(paramName);} // if(!ruleType.trim().equals("")){
// if(!paramValue.trim().equals("")){modelParameter.setParameterValue(paramValue);} // if(ruleType == 1){
// if(!paramType.trim().equals("")){modelParameter.setParameterDataType(paramType);} // accuracyRule.setruleType("范围");
// }else if(ruleType == 2){
// accuracyRule.setruleType("重复");
// }
// }
// if(!scopeMaxValue.trim().equals("")){accuracyRule.setscopeMaxValue(scopeMaxValue);}
// if(!scopeMinValue.trim().equals("")){accuracyRule.setscopeMinValue(scopeMinValue);}
// if(!repeatedCheckGranularity.trim().equals("")){accuracyRule.setrepeatedCheckGranularity(repeatedCheckGranularity);}
// if(!repeatedCheckStartTime.trim().equals("")){accuracyRule.setrepeatedCheckStartTime(repeatedCheckStartTime);}
// if(!repeatedCheckEndTime.trim().equals("")){accuracyRule.setrepeatedCheckEndTime(repeatedCheckEndTime);}
// if(!ifRepeatedCheckSeries.trim().equals("")){accuracyRule.setifRepeatedCheckSeries(ifRepeatedCheckSeries);}
// if(!repeatedCheckMaxTime.trim().equals("")){accuracyRule.setrepeatedCheckMaxTime(repeatedCheckMaxTime);}
// if(!ifRepeatedCheckSummation.trim().equals("")){accuracyRule.setifRepeatedCheckSummation(ifRepeatedCheckSummation);}
// //
// modelParameterDao.save(modelParameter); // accuracyRuleDao.save(accuracyRule);
// //
// Long dataModelId = modelParameter.getParameterId(); // Long accuracyRuleId = accuracyRule.getaccuracyRuleId();
// dataModelIdList.add(dataModelId); // qualityRuleIdList.add(qualityRuleId);
// } // }
// //新增质量模型 // //新增质量模型
// @RequestMapping(value = "/saveModelDataForm", method = RequestMethod.POST) // @RequestMapping(value = "/saveRuleDataForm", method = RequestMethod.POST)
// public String saveModelDataForm(HttpServletResponse response,HttpServletRequest request) throws ParseException{ // public String saveRuleDataForm(HttpServletResponse response,HttpServletRequest request) throws ParseException{
// String dataModelName = ""; // Long qualityRuleId = "";
// String modelDesc = ""; // Long businessId = "";
// String ruleDefinition = ""; // Long kpiId = "";
// String evaluationMethod = ""; // Long channelId = "";
// String evaluationStandard = ""; // Long provinceId = "";
// String modelType = ""; // Long dataSourceId = "";
// String deployedServer = ""; // String kpiMonitorTime = "";
// String modelStatus = ""; // String kpiMonitorRunTime = "";
// //String cycleMinutes = ""; // String businessTime = "";
// String modelExeScriptName = ""; // Date ruleCrtTime = "";
// String kpiTypeId = ""; // Date ruleUpdateTime = "";
// String businessEndTime = ""; // String ruleValidFlag = "";
// String businessStartTime = ""; // String ifSystemValue = "";
// Date publishTime = new Date();
// Date updateTime = new Date(); // QualityRule qualityRule = new qualityRule();
// DataModel dataModel = new DataModel();
// SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// SimpleDateFormat batchFormat = new SimpleDateFormat("yyyyMMdd000001"); // if(!qualityRuleId.trim().equals("")){qualityRule.setqualityRuleId(Long.parseLong(qualityRuleId));}
// dataModel.setBatchNo(Long.parseLong(batchFormat.format(sd.parse(businessStartTime)))); // if(!businessId.trim().equals("")){qualityRule.setbusinessId(Long.parseLong(businessId));}
// dataModel.setDataModelName(dataModelName); // if(!kpiId.trim().equals("")){qualityRule.setkpiId(Long.parseLong(kpiId));}
// if(!modelDesc.trim().equals("")){dataModel.setModelDesc(modelDesc);} // if(!channelId.trim().equals("")){qualityRule.setchannelId(Long.parseLong(channelId));}
// if(!ruleDefinition.trim().equals("")){dataModel.setRuleDefinition(ruleDefinition);} // if(!provinceId.trim().equals("")){qualityRule.setprovinceId(Long.parseLong(provinceId));}
// if(!evaluationMethod.trim().equals("")){dataModel.setEvaluationMethod(evaluationMethod);} // if(!dataSourceId.trim().equals("")){qualityRule.setdataSourceId(Long.parseLong(dataSourceId));}
// if(!evaluationStandard.trim().equals("")){dataModel.setEvaluationStandard(evaluationStandard);} // if(!kpiMonitorTime.trim().equals("")){qualityRule.setkpiMonitorTime(kpiMonitorTime);}
// if(!modelType.trim().equals("")){dataModel.setDataModelTypeId(Long.parseLong(modelType));} // qualityRule.setkpiMonitorRunTime(kpiMonitorTime);
// if(!deployedServer.trim().equals("")){dataModel.setServerId(Long.parseLong(deployedServer));} // if(!businessTime.trim().equals("")){qualityRule.setbusinessTime(businessTime);}
// if(!modelStatus.trim().equals("")){dataModel.setModelStatus(Long.parseLong(modelStatus));} // qualityRule.setruleCrtTime(sd.parse(ruleCrtTime));
// if(!kpiTypeId.trim().equals("")){dataModel.setKpiTypeId(Long.parseLong(kpiTypeId));} // qualityRule.setruleUpdateTime(sd.parse(ruleUpdateTime));
// /*if(!cycleMinutes.trim().equals("")){dataModel.setCycleMinutes(Long.parseLong(cycleMinutes));}*/ // qualityRule.setruleValidFlag(1);
// dataModel.setModelPublishTime(publishTime); // qualityRule.setifSystemValue(1);
// dataModel.setModelUpdateTime(updateTime);
// dataModel.setBusinessStartTime(sd.parse(businessStartTime));
// dataModel.setBusinessEndTime(sd.parse(businessEndTime));
// qualityRuleDao.save(qualityRule); // qualityRuleDao.save(qualityRule);
// cmszOperationLogService.createLog("增加","新建质量模型","quality_rule_warehouse_info_t. QUALITY_RULE_ID="+ qualityRule.getQualityRuleId().toString()); // cmszOperationLogService.createLog("增加","新建质量模型","quality_rule_warehouse_info_t. QUALITY_RULE_ID="+ qualityRule.getQualityRuleId().toString());
// Long dataModelId = dataModel.getDataModelId(); // Long qualityRuleId = qualityRule.getqualityRuleId();
// return "redirect:AnalysisSupport/QualityRuleResult"; // return "redirect:AnalysisSupport/QualityRuleResult";
// } // }
}
} }
src/main/java/com/hp/cmsz/web/analysissupport/QualityRuleResultController.java
View file @ 25299f62
...@@ -19,15 +19,17 @@ import org.springframework.web.bind.annotation.ResponseBody; ...@@ -19,15 +19,17 @@ import org.springframework.web.bind.annotation.ResponseBody;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.hp.cmsz.entity.AccuracyRule; import com.hp.cmsz.entity.AccuracyRule;
import com.hp.cmsz.entity.Channel; import com.hp.cmsz.entity.Channel;
import com.hp.cmsz.entity.DataSource;
import com.hp.cmsz.entity.Kpi; import com.hp.cmsz.entity.Kpi;
import com.hp.cmsz.entity.Province; import com.hp.cmsz.entity.Province;
import com.hp.cmsz.entity.QualityRule; import com.hp.cmsz.entity.QualityRule;
import com.hp.cmsz.repository.AccuracyRuleDao; import com.hp.cmsz.repository.AccuracyRuleDao;
import com.hp.cmsz.repository.ChannelDao; import com.hp.cmsz.repository.DataSourceDao;
import com.hp.cmsz.repository.KpiDao; import com.hp.cmsz.repository.KpiDao;
import com.hp.cmsz.repository.ProvinceDao; import com.hp.cmsz.repository.ProvinceDao;
import com.hp.cmsz.repository.QualityRuleDao; import com.hp.cmsz.repository.QualityRuleDao;
import com.hp.cmsz.service.BusinessService; import com.hp.cmsz.service.BusinessService;
import com.hp.cmsz.service.ChannelService;
import com.hp.cmsz.service.CmszOperationLogService; import com.hp.cmsz.service.CmszOperationLogService;
import com.hp.cmsz.service.analysissupport.AccuracyRuleService; import com.hp.cmsz.service.analysissupport.AccuracyRuleService;
import com.hp.cmsz.service.analysissupport.QualityRuleService; import com.hp.cmsz.service.analysissupport.QualityRuleService;
...@@ -44,172 +46,180 @@ import com.hp.cmsz.web.PageURLController; ...@@ -44,172 +46,180 @@ import com.hp.cmsz.web.PageURLController;
@RequestMapping(value="AnalysisSupport/QualityRuleResult") @RequestMapping(value="AnalysisSupport/QualityRuleResult")
public class QualityRuleResultController { public class QualityRuleResultController {
// @Autowired @Autowired
// private ProvinceDao provinceDao; private ProvinceDao provinceDao;
//
// @Autowired @Autowired
// private ChannelDao channelDao; private ChannelService channelService;
//
// @Autowired @Autowired
// private BusinessService businessService; private BusinessService businessService;
//
// @Autowired @Autowired
// private KpiDao kpiDao; private KpiDao kpiDao;
//
// @Autowired @Autowired
// private QualityRuleDao qualityRuleDao; private DataSourceDao dataSourceDao;
//
// @Autowired @Autowired
// private QualityRuleService qualityRuleService; private QualityRuleDao qualityRuleDao;
//
// @Autowired @Autowired
// private AccuracyRuleService accuracyRuleService; private QualityRuleService qualityRuleService;
//
// @Autowired @Autowired
// private AccuracyRuleDao accuracyRuleDao; private AccuracyRuleService accuracyRuleService;
//
// @Autowired @Autowired
// private CmszOperationLogService cmszOperationLogService; private AccuracyRuleDao accuracyRuleDao;
//
// private String staticProvinceId = ""; @Autowired
// private String staticChannelId = ""; private CmszOperationLogService cmszOperationLogService;
// private String staticKpiId = "";
// private String staticBusinessId = ""; List<QualityRule> staticQualityRuleList = new ArrayList<QualityRule>();
// List<QualityRule> staticQualityRuleList = new ArrayList<QualityRule>();
@RequestMapping(value = "") @RequestMapping(value = "")
public String ruleResultHome( public String ruleResultHome(
@RequestParam(value = "rulePageNum", defaultValue="1") String rulePageNum, @RequestParam(value = "rulePageNum", defaultValue="1") String rulePageNum,
Map model){ Map model){
// //查询出所有的省份 //查询出所有省份的信息
// List<Province> provinceList=(List<Province>)provinceDao.findProvince(); List<Province> provinceList=(List<Province>)provinceDao.findAll();
// //查询出所有的渠道信息 //查询出所有的渠道信息
// List<Channel> channelList=(List<Channel>)channelDao.findChannel(); //List<Channel> channelList=(List<Channel>)channelDao.findChannel();
// //查询出所有的指标 List<Channel> channelList = channelService.getAllChannels();
// List<Kpi> kpiList=(List<Kpi>)kpiDao.findAll(); //查询出所有的指标
// //查询出所有的业务 List<Kpi> kpiList=(List<Kpi>)kpiDao.findAll();
// List<String> businessList=businessService.getAllBusinessIdAndBusinessName(); //查询出所有的业务
// //查询出所有的质量规则 List<String> businessList=businessService.getAllBusinessIdAndBusinessName();
// List<QualityRule> qualityRuleList=(List<QualityRule>)qualityRuleDao.findAll(); //查询出所有的数据来源信息
// List<DataSource> datasourceList=(List<DataSource>)dataSourceDao.findDataSource();
// Gson gson = new Gson(); //查询出所有的质量规则
// model.put("provinceList", gson.toJson(provinceList)); List<QualityRule> qualityRuleList=(List<QualityRule>)qualityRuleDao.findAll();
// model.put("channelList", gson.toJson(channelList));
// model.put("kpiList", gson.toJson(kpiList)); Gson gson = new Gson();
// model.put("businessList", gson.toJson(businessList)); model.put("provinceList", gson.toJson(provinceList));
// model.put("qualityRuleList", gson.toJson(qualityRuleList)); model.put("channelList", channelList);
// model.put("rulePageNum", rulePageNum); model.put("kpiList", kpiList);
// cmszOperationLogService.createLog("查询","质量规则","质量规则首页"); model.put("businessList",businessList);
model.put("datasourceList", datasourceList);
model.put("qualityRuleList", qualityRuleList);
model.put("rulePageNum", rulePageNum);
cmszOperationLogService.createLog("查询","质量规则","质量规则首页");
return PageURLController.RuleResult; return PageURLController.RuleResult;
} }
// //根据筛选项更新表格 //根据筛选项更新表格
// @RequestMapping(value = "/ruleTableChange*",method = RequestMethod.GET) @RequestMapping(value = "/ruleTableChange*",method = RequestMethod.GET)
// @ResponseBody @ResponseBody
// public void modelTableChange( public void modelTableChange(
// @RequestParam(value = "provinceId", defaultValue="") String provinceId, @RequestParam(value = "province", defaultValue="") String province,
// @RequestParam(value = "channelId", defaultValue="") String channelId, @RequestParam(value = "channel", defaultValue="") String channel,
// @RequestParam(value = "kpiId", defaultValue="") String kpiId, @RequestParam(value = "datasource", defaultValue="") String datasource,
// @RequestParam(value = "businessId", defaultValue="") String businessId, @RequestParam(value = "business", defaultValue="") String business,
// HttpServletResponse response) throws UnsupportedEncodingException{ HttpServletResponse response) throws UnsupportedEncodingException{
// staticProvinceId = provinceId;
// staticChannelId = channelId; cmszOperationLogService.createLog("查询","质量规则","由筛选项得到质量规则");
// staticKpiId = kpiId; List<QualityRule> qualityRuleS;
// staticBusinessId = businessId; //将String型转换成List
// List<QualityRule> qualityRuleList = new ArrayList<QualityRule>(); String[] channels=channel.split(",");
// int size1=channels.length;
// List<Long> provinceIdList = new ArrayList<Long>(); Long[] channelS=new Long[size1];
// for(int i=0;i<provinceId.split(",").length;i++){ for(int i=0;i<channels.length;i++)
// provinceIdList.add(Long.parseLong(provinceId.split(",")[i])); {
// } channelS[i]=Long.parseLong(channels[i]);
// List<Long> channelIdList = new ArrayList<Long>(); }
// for(int i=0;i<channelId.split(",").length;i++){ //将String型转换成List
// channelIdList.add(Long.parseLong(channelId.split(",")[i])); String[] dataSources=datasource.split(",");
// } int size2=dataSources.length;
// List<Long> kpiIdList = new ArrayList<Long>(); Long[] dataSourceS=new Long[size2];
// for(int i=0;i<kpiId.split(",").length;i++){ for(int i=0;i<dataSources.length;i++)
// kpiIdList.add(Long.parseLong(kpiId.split(",")[i])); {
// } dataSourceS[i]=Long.parseLong(dataSources[i]);
// List<Long> businessIdList = new ArrayList<Long>(); }
// for(int i=0;i<businessId.split(",").length;i++){ //将String型转换成List
// businessIdList.add(Long.parseLong(businessId.split(",")[i])); String[] businesss=business.split(",");
// } int size3=dataSources.length;
// Long[] businessS=new Long[size3];
// if(provinceId.equals("") && channelId.equals("") && businessId.equals("") && kpiId.equals("")){ for(int i=0;i<businesss.length;i++)
// qualityRuleList = qualityRuleDao.findAll(); {
// } else { businessS[i]=Long.parseLong(businesss[i]);
// qualityRuleList = qualityRuleDao.findByProvinceIdInAndBusinessIdInAndKpiIdInAndChannelIdInOrderByQualityRuleIdDesc(provinceIdList, businessIdList, kpiIdList, channelIdList); }
// } //将String型转换成List
// String[] provinces=province.split(",");
// cmszOperationLogService.createLog("查询","质量规则","由筛选项得到质量规则"); int size4=dataSources.length;
// staticQualityRuleList = qualityRuleList; Long[] provinceS=new Long[size4];
// for(int i=0;i<provinces.length;i++)
// Gson gson = new Gson(); {
// response.setContentType("text/Xml;charset=gbk"); provinceS[i]=Long.parseLong(provinces[i]);
// PrintWriter out = null; }
// try {
// out = response.getWriter(); qualityRuleS=qualityRuleService.getAllQualityRuleByOther(provinceS, dataSourceS, channelS, businessS);
// out.println(gson.toJson(qualityRuleList));
// } catch (IOException e) { Gson gson = new Gson();
// // TODO Auto-generated catch block response.setContentType("text/Xml;charset=gbk");
// e.printStackTrace(); PrintWriter out = null;
// } try {
// out = response.getWriter();
// } out.println(gson.toJson(qualityRuleS));
// } catch (IOException e) {
// //删掉质量规则 // TODO Auto-generated catch block
// @RequestMapping(value = "/deleteOneRule*",method = RequestMethod.GET) e.printStackTrace();
// @ResponseBody }
// public void deleteRule(
// @RequestParam(value = "qualityRuleId") String qualityRuleId, }
// HttpServletResponse response){
// List<Long> qualityRuleIdList = new ArrayList<Long>(); //删掉质量规则
// String[] qualityRuleIdStr = qualityRuleId.split(","); @RequestMapping(value = "/deleteOneRule*",method = RequestMethod.GET)
// for(int i=0; i<qualityRuleIdStr.length; i++){ @ResponseBody
// qualityRuleIdList.add(Long.parseLong(qualityRuleIdStr[i])); public void deleteRule(
// } @RequestParam(value = "qualityRuleId") String qualityRuleId,
// HttpServletResponse response){
// qualityRuleService.deleteByQualityRuleId(qualityRuleIdList); List<Long> qualityRuleIdList = new ArrayList<Long>();
// accuracyRuleService.deleteAccuracyRuleByQualityRuleId(qualityRuleIdList); String[] qualityRuleIdStr = qualityRuleId.split(",");
// cmszOperationLogService.createLog("删除","更新质量规则","quality_rule_warehouse_info_t. QUALITY_RULE_ID="+qualityRuleId); for(int i=0; i<qualityRuleIdStr.length; i++){
// //刷新模型表格 qualityRuleIdList.add(Long.parseLong(qualityRuleIdStr[i]));
// List<QualityRule> qualityRuleList = new ArrayList<QualityRule>(); }
// qualityRuleList = qualityRuleDao.findAll();
// staticQualityRuleList = qualityRuleList; qualityRuleService.deleteByQualityRuleId(qualityRuleIdList);
// accuracyRuleService.deleteAccuracyRuleByQualityRuleId(qualityRuleIdList);
// Gson gson = new Gson(); cmszOperationLogService.createLog("删除","更新质量规则","quality_rule_warehouse_info_t. QUALITY_RULE_ID="+qualityRuleId);
// response.setContentType("text/Xml;charset=gbk"); //刷新模型表格
// PrintWriter out = null; List<QualityRule> qualityRuleList = (List<QualityRule>) qualityRuleDao.findAll();
// staticQualityRuleList = qualityRuleList;
// try {
// out = response.getWriter(); Gson gson = new Gson();
// out.println(gson.toJson(qualityRuleList)); response.setContentType("text/Xml;charset=gbk");
// } catch (IOException e) { PrintWriter out = null;
// // TODO Auto-generated catch block
// e.printStackTrace(); try {
// } out = response.getWriter();
// } out.println(gson.toJson(qualityRuleList));
// } catch (IOException e) {
// //查看准确性规则内容 // TODO Auto-generated catch block
// @RequestMapping(value = "/findAccuracy*",method = RequestMethod.GET) e.printStackTrace();
// @ResponseBody }
// public void findAccuracy( }
// @RequestParam(value = "qualityRuleId") String qualityRuleId,
// HttpServletResponse response){ //查看准确性规则内容
// List<AccuracyRule> accuracyRuleList = accuracyRuleDao.findByQualityRuleId(Long.parseLong(qualityRuleId)); @RequestMapping(value = "/findAccuracy*",method = RequestMethod.GET)
// cmszOperationLogService.createLog("查询","准确性规则","查询准确性规则"); @ResponseBody
// Gson gson = new Gson(); public void findAccuracy(
// response.setContentType("text/Xml;charset=gbk"); @RequestParam(value = "qualityRuleId") String qualityRuleId,
// PrintWriter out = null; HttpServletResponse response){
// List<AccuracyRule> accuracyRuleList = accuracyRuleDao.findByQualityRuleId(Long.parseLong(qualityRuleId));
// try { cmszOperationLogService.createLog("查询","准确性规则","查询准确性规则");
// out = response.getWriter(); Gson gson = new Gson();
// out.println(gson.toJson(accuracyRuleList)); response.setContentType("text/Xml;charset=gbk");
// } catch (IOException e) { PrintWriter out = null;
// // TODO Auto-generated catch block
// e.printStackTrace(); try {
// } out = response.getWriter();
// } out.println(gson.toJson(accuracyRuleList));
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
} }
src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp
View file @ 25299f62
...@@ -22,13 +22,6 @@ ...@@ -22,13 +22,6 @@
.table-null tr td:last-child .form-control,.table-null tr td:last-child table{ .table-null tr td:last-child .form-control,.table-null tr td:last-child table{
width: 400px; width: 400px;
} }
.file-box{ position:relative;}
.file{ position:absolute; top:0; height:30px; filter:alpha(opacity:0);opacity:0;width:470px;cursor: pointer; }
/* .file-box{ position:relative;width:340px}
.txt{ height:22px; border:1px solid #cdcdcd; width:180px;}
.btn{ background-color:#FFF; border:1px solid #CDCDCD;height:24px; width:70px;}
.file{ position:absolute; top:0; right:80px; height:24px; filter:alpha(opacity:0);opacity: 0;width:260px } */
</style> </style>
</head> </head>
...@@ -53,60 +46,68 @@ ...@@ -53,60 +46,68 @@
<form action="#" class="form-horizontal" id="ruleMaintainForm" method="post" enctype="multipart/form-data"> <form action="#" class="form-horizontal" id="ruleMaintainForm" method="post" enctype="multipart/form-data">
<table id="ruleMaintainTable" class="table-null"> <table id="ruleMaintainTable" class="table-null">
<tr><td>省份（<font color="red">必填</font>）：</td> <tr><td>省份（<font color="red">必填</font>）：</td>
<td><tags:ProvinceTag /></td> <td>
<c:forEach var="province" items="${provinceList}">
<input type="checkbox" name="province" id="province" value="${province.provinceId}" checked>${province.provinceName}
</c:forEach>
</td>
</tr>
<tr><td>数据来源（<font color="red">必填</font>）：</td>
<td><select class="form-control" name="dataSource" id="dataSource" >
<c:forEach var="dataSource" items="${dataSourceList}">
<option value="${dataSource.dataSourceId}">${dataSource.dataSourceName}</option>
</c:forEach>
</select></td>
</tr> </tr>
<tr><td>渠道（<font color="red">必填</font>）：</td> <tr><td>渠道（<font color="red">必填</font>）：</td>
<td><tags:ChannelTag /></td> <td><select class="form-control" name="channel" id="channel" >
<c:forEach var="channel" items="${channelList}">
<option value="${channel.channelId}">${channel.channelName}</option>
</c:forEach>
</select></td>
</tr> </tr>
<tr><td>业务（<font color="red">必填</font>）：</td> <tr><td>业务（<font color="red">必填</font>）：</td>
<td><tags:BusinessTag /></td> <td >
<div id="businesstd"></div>
<input type="hidden" id="business" name="business" value='${businessList}' />
</td>
</tr> </tr>
<tr><td>数据来源（<font color="red">必填</font>）：</td> <tr><td>指标（<font color="red">必填</font>）：</td>
<td><tags:DataSourceTag /></td> <td>
<div id="kpitd"></div>
<input type="hidden" id="kpi" name="kpi" value='${kpiList}' />
</td>
</tr> </tr>
<tr><td>数据采集频率（<font color="red">必填</font>）：</td> <tr><td>数据采集频率（<font color="red">必填</font>）：</td>
<td><select class="form-control" name="" id="" style="display: inline;"> <td><select class="form-control" name="calCycle" id="calCycle" style="display: inline;">
<option value="0">30分钟</option> <option value="30MI">30分钟</option>
<option value="1">1小时</option> <option value="01HR">1小时</option>
<option value="2">1天</option> <option value="01DY">1天</option>
<option value="3">1月</option> <option value="01MO">1月</option>
</select></td></tr> </select></td></tr>
<tr><td>指标检测时间（<font color="red">必填</font>）：</td> <tr><td>指标监控时间（<font color="red">必填</font>）：</td>
<td> <td>
<div> <input type="text" style="width:200px" name="kpiMonitorTime" id="kpiMonitorTime" style="display: inline;" />
<input type="text" class="form-control" name="kpiMonitorTime" id="kpiMonitorTime" style="display: inline;" /> <select style="width:200px" name="kpiUnit" id="kpiUnit" style="display: inline;">
<select class="form-control" name="" id="" style="display: inline;">
<option value="0">分钟</option> <option value="0">分钟</option>
<option value="1">小时</option> <option value="1">小时</option>
<option value="2">天</option> <option value="2">天</option>
<option value="3">月</option> <option value="3">月</option>
</select> </select></td>
</div></td>
</tr> </tr>
<tr><td>指标检测范围（<font color="red">必填</font>）：</td> <tr><td>指标业务时间（<font color="red">必填</font>）：</td>
<td> <td>
<div> <input type="text" class="form-control" name="businessTime" id="businessTime" onFocus="WdatePicker({maxDate:'#F{$dp.$D(\'businessTime\')}'})" />
<input type="text" class="form-control" name="kpiMonitorRange" id="kpiMonitorRange" style="display: inline;" /> </td>
<select class="form-control" name="" id="" style="display: inline;">
<option value="0">分钟</option>
<option value="1">小时</option>
<option value="2">天</option>
<option value="3">月</option>
</select>
</div></td>
</tr> </tr>
<tr><td>完整性阈值（<font color="red">必填</font>）:</td><td><input type='text' name='integrityThresholdValue' id='integrityThresholdValue' class="form-control" style="display: inline;"/></td></tr>
<tr><td>及时性阈值（<font color="red">必填</font>）:</td><td><input type='text' name='timelinessThresholdValue' id='timelinessThresholdValue' class="form-control" style="display: inline;"/></td></tr>
<tr><td>规则创建时间（<font color="red">必填</font>）：</td><td><input type="text" class="form-control" id="ruleCrtTime" name="ruleCrtTime" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'ruleCrtTime\')}'})" /></td></tr> <tr><td>规则创建时间（<font color="red">必填</font>）：</td><td><input type="text" class="form-control" id="ruleCrtTime" name="ruleCrtTime" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'ruleCrtTime\')}'})" /></td></tr>
<tr><td>规则更新时间（<font color="red">必填</font>）：</td><td><input id="ruleUpdateTime" name="ruleUpdateTime" class="form-control" type="text" onFocus="WdatePicker({maxDate:'#F{$dp.$D(\'ruleUpdateTime\')}'})"> </td></tr> <tr><td>规则更新时间（<font color="red">必填</font>）：</td><td><input id="ruleUpdateTime" name="ruleUpdateTime" class="form-control" type="text" onFocus="WdatePicker({maxDate:'#F{$dp.$D(\'ruleUpdateTime\')}'})"> </td></tr>
<tr><td>准确性规则：</td> <tr><td>准确性规则：</td>
<td><select class="form-control" name="accuracyRule" id="accuracyRule" > <td><select class="form-control" name="ruleType" id="ruleType" >
<option value="0">无</option> <option value="">无</option>
<option value="1">范围类</option> <option value="1">范围类</option>
<option value="2">重复类</option> <option value="2">重复类</option>
</select></td></tr> </select></td></tr>
<tr class="range"><td>范围最大值：</td><td><input type="text" class="form-control" name="scopeMaxValue" id="scopeMaxValue" /></td></tr> <tr class="range"><td>范围最大值：</td><td><input type="text" class="form-control" name="scopeMaxValue" id="scopeMaxValue" /></td></tr>
<tr class="range"><td>范围最小值：</td><td><input type="text" class="form-control" name="scopeMinValue" id="scopeMinValue" /></td></tr> <tr class="range"><td>范围最小值：</td><td><input type="text" class="form-control" name="scopeMinValue" id="scopeMinValue" /></td></tr>
<tr class="repeate"><td>重复考核粒度：</td><td><input type='text' name='repeatedCheckGranularity' id='repeatedCheckGranularity' class="form-control" style="display: inline;"/></td></tr> <tr class="repeate"><td>重复考核粒度：</td><td><input type='text' name='repeatedCheckGranularity' id='repeatedCheckGranularity' class="form-control" style="display: inline;"/></td></tr>
...@@ -116,9 +117,8 @@ ...@@ -116,9 +117,8 @@
<tr class="repeate"><td>重复最大次数：</td><td><input type='text' name='repeatedCheckMaxTime' id='repeatedCheckMaxTime' class="form-control" style="display: inline;"/></td></tr> <tr class="repeate"><td>重复最大次数：</td><td><input type='text' name='repeatedCheckMaxTime' id='repeatedCheckMaxTime' class="form-control" style="display: inline;"/></td></tr>
<tr class="repeate"><td>数据是否累计：</td><td><input type='text' name='ifRepeatedCheckSummation' id='ifRepeatedCheckSummation' class="form-control" style="display: inline;"/></td></tr> <tr class="repeate"><td>数据是否累计：</td><td><input type='text' name='ifRepeatedCheckSummation' id='ifRepeatedCheckSummation' class="form-control" style="display: inline;"/></td></tr>
<tr><td></td><td><button type="button" id="ruleSubmit" class="btn btn-primary">确定</button> <tr><td></td><td><button type="button" id="ruleSubmit" class="btn btn-primary">确定</button>
<button type="reset" class="btn btn-warning" id="ruleBack">返回</button>
<button type="reset" class="btn btn-warning" id="ruleBack">返回</button> </td></tr>
</td></tr>
</table> </table>
</form> </form>
</div> </div>
...@@ -132,10 +132,10 @@ ...@@ -132,10 +132,10 @@
<script type="text/javascript"> <script type="text/javascript">
$(".range").hide(); $(".range").hide();
$(".repeate").hide(); $(".repeate").hide();
$("#accuracyRule").change(function (){ $("#ruleType").change(function (){
var selectValue = $("#accuracyRule").val(); var selectValue = $("#ruleType").val();
console.log(selectValue); console.log(selectValue);
if (selectValue == 0){ if (selectValue == ""){
$(".range").hide(); $(".range").hide();
$(".repeate").hide(); $(".repeate").hide();
} }
...@@ -149,54 +149,54 @@ $("#accuracyRule").change(function (){ ...@@ -149,54 +149,54 @@ $("#accuracyRule").change(function (){
} }
}) })
//form表单重置
$("#modelReset").click(function(){
deleteAllTr();
});
//form表单提交 //form表单提交
$("#modelSubmit").click(function(){ $("#ruleSubmit").click(function(){
if($.trim($("#dataModelName").val())==""){ if($.trim($("kpiMonitorTime").val())==""){
$.alert("数据模型名称不能为空"); $.alert("指标监控时间不能为空");
}else if($("#modelExeScriptName").val()==""){ }else if($("#businessTime").val()==""){
$.alert("模型执行脚本不能为空"); $.alert("指标业务时间不能为空");
}else if($("#businessStartTime").val()==""){ }else if($("#ruleCrtTime").val()==""){
$.alert("业务开始时间不能为空"); $.alert("规则创建时间不能为空");
}else if($("#businessEndTime").val()==""){ }else if($("#ruleUpdateTime").val()==""){
$.alert("业务结束时间不能为空"); $.alert("规则更新时间不能为空");
}else{ }else{
if($.trim($("#paramName").val())!=""){ if($.trim($("#ruleType").val())!=""){
$.dialog({ $.dialog({
title: "提醒", title: "提醒",
content: "有参数尚未添加，确定提交", content: "有准确性规则参数尚未添加，确定提交",
ok: function(){ ok: function(){
$("#modelSubmit").attr("disabled",true); $("#ruleSubmit").attr("disabled",true);
var i = $("#addTr").find("tr").size(); var i = $("#addTr").find("tr").size();
if(i==0){ if(i==0){
var createForm=$("#modelMaintainForm"); var createForm=$("#ruleMaintainForm");
createForm.attr("action","${ctx}/ModelManage/ModelMaintain/saveModelDataForm"); createForm.attr("action","${ctx}/AnalysisSupport/QualityRuleMaintain/saveRuleDataForm");
createForm.submit(); createForm.submit();
createForm.attr("action","#"); createForm.attr("action","#");
}else{ }else{
$("#addTr").find("tr").each(function(){ $("#addTr").find("tr").each(function(){
//alert($(this).find("td").eq(0).html()); var ruleType = $(this).find("td").eq(0).html();
var paramName = $(this).find("td").eq(0).html(); var scopeMaxValue = $(this).find("td").eq(1).html();
var paramValue = $(this).find("td").eq(1).html(); var scopeMinValue = $(this).find("td").eq(2).html();
var paramType = $(this).find("td").eq(2).html(); var repeatedCheckGranularity = $(this).find("td").eq(3).html();
var repeatedCheckStartTime = $(this).find("td").eq(4).html();
var repeatedCheckEndTime = $(this).find("td").eq(5).html();
var ifRepeatedCheckSeries = $(this).find("td").eq(6).html();
var repeatedCheckMaxTime = $(this).find("td").eq(7).html();
var ifRepeatedCheckSummation = $(this).find("td").eq(8).html();
$.ajax({ $.ajax({
type : "GET", type : "GET",
contentType : "application/json", contentType : "application/json",
url: "${ctx}/ModelManage/ModelMaintain/createModelParam?paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType), url: "${ctx}/AnalysisSupport/QualityRuleMaintain/createAccuracyRule?ruleType="+ruleType+"&scopeMaxValue="+scopeMaxValue+"&scopeMinValue="+scopeMinValue+"&repeatedCheckGranularity="+repeatedCheckGranularity+"&repeatedCheckStartTime="+repeatedCheckStartTime+"&repeatedCheckEndTime="+repeatedCheckEndTime+"&scopeMinValue="+ifRepeatedCheckSeries+"&ifRepeatedCheckSeries="+repeatedCheckMaxTime+"&repeatedCheckMaxTime="+ifRepeatedCheckSummation+"&ifRepeatedCheckSummation=",
dataType : "text", dataType : "text",
async: false, async: false,
beforeSend: function(data) {}, beforeSend: function(data) {},
success: function(){ success: function(){
i--; i--;
if(i==0){ if(i==0){
var createForm=$("#modelMaintainForm"); var createForm=$("#ruleMaintainForm");
createForm.attr("action","${ctx}/ModelManage/ModelMaintain/saveModelDataForm"); createForm.attr("action","${ctx}/AnalysisSupport/QualityRuleMaintain/saveRuleDataForm");
createForm.submit(); createForm.submit();
createForm.attr("action","#"); createForm.attr("action","#");
} }
...@@ -210,32 +210,37 @@ $("#accuracyRule").change(function (){ ...@@ -210,32 +210,37 @@ $("#accuracyRule").change(function (){
cancelValue: "取消", cancelValue: "取消",
}); });
}else{ }else{
$("#modelSubmit").attr("disabled",true); $("#ruleSubmit").attr("disabled",true);
var i = $("#addTr").find("tr").size(); var i = $("#addTr").find("tr").size();
if(i==0){ if(i==0){
var createForm=$("#modelMaintainForm"); var createForm=$("#ruleMaintainForm");
createForm.attr("action","${ctx}/ModelManage/ModelMaintain/saveModelDataForm"); createForm.attr("action","${ctx}/AnalysisSupport/QualityRuleMaintain/saveRuleDataForm");
createForm.submit(); createForm.submit();
createForm.attr("action","#"); createForm.attr("action","#");
}else{ }else{
$("#addTr").find("tr").each(function(){ $("#addTr").find("tr").each(function(){
//alert($(this).find("td").eq(0).html()); var ruleType = $(this).find("td").eq(0).html();
var paramName = $(this).find("td").eq(0).html(); var scopeMaxValue = $(this).find("td").eq(1).html();
var paramValue = $(this).find("td").eq(1).html(); var scopeMinValue = $(this).find("td").eq(2).html();
var paramType = $(this).find("td").eq(2).html(); var repeatedCheckGranularity = $(this).find("td").eq(3).html();
var repeatedCheckStartTime = $(this).find("td").eq(4).html();
var repeatedCheckEndTime = $(this).find("td").eq(5).html();
var ifRepeatedCheckSeries = $(this).find("td").eq(6).html();
var repeatedCheckMaxTime = $(this).find("td").eq(7).html();
var ifRepeatedCheckSummation = $(this).find("td").eq(8).html();
$.ajax({ $.ajax({
type : "GET", type : "GET",
contentType : "application/json", contentType : "application/json",
url: "${ctx}/ModelManage/ModelMaintain/createModelParam?paramName="+encodeURIComponent(paramName)+"&paramValue="+encodeURIComponent(paramValue)+"&paramType="+encodeURIComponent(paramType), url: "${ctx}/AnalysisSupport/QualityRuleMaintain/createAccuracyRule?ruleType="+ruleType+"&scopeMaxValue="+scopeMaxValue+"&scopeMinValue="+scopeMinValue+"&repeatedCheckGranularity="+repeatedCheckGranularity+"&repeatedCheckStartTime="+repeatedCheckStartTime+"&repeatedCheckEndTime="+repeatedCheckEndTime+"&scopeMinValue="+ifRepeatedCheckSeries+"&ifRepeatedCheckSeries="+repeatedCheckMaxTime+"&repeatedCheckMaxTime="+ifRepeatedCheckSummation+"&ifRepeatedCheckSummation=",
dataType : "text", dataType : "text",
async: false, async: false,
beforeSend: function(data) {}, beforeSend: function(data) {},
success: function(){ success: function(){
i--; i--;
if(i==0){ if(i==0){
var createForm=$("#modelMaintainForm"); var createForm=$("#ruleMaintainForm");
createForm.attr("action","${ctx}/ModelManage/ModelMaintain/saveModelDataForm"); createForm.attr("action","${ctx}/AnalysisSupport/QualityRuleMaintain/saveRuleDataForm");
createForm.submit(); createForm.submit();
createForm.attr("action","#"); createForm.attr("action","#");
} }
...@@ -248,9 +253,114 @@ $("#accuracyRule").change(function (){ ...@@ -248,9 +253,114 @@ $("#accuracyRule").change(function (){
} }
}); });
$("#modelBack").click(function(){ $("#ruleBack").click(function(){
location.href="${ctx}/ModelManage/ModelResult"; location.href="${ctx}/AnalysisSupport/QualityRuleResult";
});
var dataSourceValue = $("#dataSource").val();
var channelValue = $("#channel").val();
$("#dataSource").change(function(){
dataSourceValue = $("#dataSource").val();
console.log(dataSourceValue);
updateBusiness(dataSourceValue,channelValue);
});
$("#channel").change(function(){
channelValue = $("#channel").val();
console.log(channelValue);
updateBusiness(dataSourceValue,channelValue);
});
function getBusinessCheckedValues(){
var businessArray = new Array();
var i=0;
$("#business:checked").each(function(){
businessArray[i]=$(this).val();
i++;
});
return businessArray;
}
function getBusinessCheckedValuesString(){
var businessStr="";
var businessArray=getBusinessCheckedValues();
for(var i=0;i<businessArray.length;i++){
if(i==businessArray.length-1){
businessStr+=businessArray[i];
}else{
businessStr+=businessArray[i]+",";
}
}
return businessStr;
}
var businessIds = getBusinessCheckedValuesString();
function updateKpi(businessIds){
$.ajax({
type : "GET",
contentType : "application/json",
url: "${ctx}/AnalysisSupport/QualityRuleMaintain/findKpiId?businessIds="+businessIds,
async: false,
beforeSend: function(data) {},
success: function(data){
var td = $("#kpitd");
td.empty();
console.log(data)
data = JSON.parse(data)
data.forEach(function(t){
td.append("<input type='checkbox' name='kpiinput' class='kpiItem' value='"+t[0]+"' checked >"+t[1]+"</input>")
});
}
});
}
function updateBusiness(dataSource,channel){
console.log(dataSource,channel)
$.ajax({
type : "GET",
contentType : "application/json",
url: "${ctx}/AnalysisSupport/QualityRuleMaintain/findBusinessId?dataSource="+dataSource+"&channel="+channel,
async: false,
beforeSend: function(data) {},
success: function(data){
var td = $("#businesstd");
var businessIds = new Array();
td.empty();
console.log(data)
data = JSON.parse(data)
console.log(data)
data.forEach(function(t){
td.append("<input type='checkbox' name='businessinput' class='businessItem' value='"+t[0]+"' checked >"+t[1]+"</input>")
businessIds+=t[0]+",";
console.log("ids:"+businessIds);
});
updateKpi(businessIds);
}
}); });
$("#business").click(function(){
var clickFlag=true;
$("#business").each(function(){
if($(this).attr("checked") == null||$(this).attr("checked") == false){ clickFlag=false;}
});
$("#business").attr("checked",clickFlag);
updateKpi(businessIds);
});
}
</script> </script>
</body> </body>
......
src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleResult.jsp
View file @ 25299f62
...@@ -40,12 +40,11 @@ ...@@ -40,12 +40,11 @@
<div class="slideMenu" id="cbp-spmenu-s2" style=""> <div class="slideMenu" id="cbp-spmenu-s2" style="">
<div class="form"> <div class="form">
<tags:ProvinceTag /> <tags:Public_ProvinceTag />
<tags:ChannelTag /> <tags:GJFX_datasource_channle_business/>
<tags:BusinessTag />
<button id="submit" class="btn btn-primary" onclick="modelResultSubmit()">提交</button> <button id="submit" class="btn btn-primary" onclick="ruleResultSubmit()">提交</button>
<button id="disable" class="btn btn-warning" onclick="modelResultReset()">重置</button> <button id="disable" class="btn btn-warning" onclick="ruleResultReset()">重置</button>
</div> </div>
</div> </div>
...@@ -92,8 +91,15 @@ ...@@ -92,8 +91,15 @@
</div> </div>
<script type="text/javascript" src="${ctx}/static/js/ruleResultDetailTable.js"></script> <script type="text/javascript" src="${ctx}/static/js/ruleResultDetailTable.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var receiveRulePageNum = "${rulePageNum}";
ruleResultDetailTable(); ruleResultDetailTable();
if(receiveRulePageNum!=1){
$("#goPageNo").attr("value",receiveRulePageNum);
$("#jumpButton").click();
}
$("#createRule").click(function(){ $("#createRule").click(function(){
$.dialog({ $.dialog({
...@@ -136,6 +142,114 @@ $("#createRule").click(function(){ ...@@ -136,6 +142,114 @@ $("#createRule").click(function(){
}); });
}); });
function ruleResultSubmit(){
var dataSource=getStatsDataSourceCheckedValuesString();
var chnnal=getStatsChannelCheckedValuesString();
var bussines=getStatsBusinessCheckedValuesString();
var province=getProvinceCheckedValuesString();
if(dataSource==""){
$.alert("数据来源的选择不能为空");
}else if(chnnal===""){
$.alert("渠道的选择不能为空");
}else if(bussines===""){
$.alert("业务的选择不能为空");
}else if(province===""){
$.alert("省份的选择不能为空");
}else{
toggleMenu('slidePushMenus');//隐藏筛选项
//数据来源标签
$('#DataSourceTag').text("数据来源").append($("<span class='badge'></span>").text(getStatsDataSourceCheckedValues().length)).attr('data-original-title',getStatsDataSourceCheckedTitles()).tooltip();
//渠道标签
$('#ChannelTag').text("渠道").append($("<span class='badge'></span>").text(getStatsChannelCheckedValues().length)).attr('data-original-title',getStatsChannelCheckedTitles()).tooltip();
//业务标签
$('#BusinessTag').text("业务").append($("<span class='badge'></span>").text(getStatsBusinessCheckedValues().length)).attr('data-original-title',getStatsBusinessCheckedTitlesString()).tooltip();
//省份标签
$('#ProvinceTag').text("省份").append($("<span class='badge'></span>").text(getProvinceCheckedValues().length)).attr('data-original-title',getProvinceCheckedTitles()).tooltip();
$.ajax({
type : 'GET',
contentType : 'application/json',
url: "${ctx}/AnalysisSupport/QualityRuleResult/ruleTableChange?province="+province+"&dataSource="+dataSource+"&chnnal="+chnnal+"&bussines="+bussines,
dataType : 'text',
async: false,
beforeSend: function(data) {
},
success: function(data) {
$("#qualityRuleView").val(data);
ruleResultDetailTable();
ruleId="";
$("#updateRule").attr("disabled", true);
toggleMenu('slidePushMenus2');//隐藏筛选项
updateTag(true);
}
});
}
function ruleResultReset(){
ProvinceReset();
statsDataSourceReset();//三级联动重置
}
//更新按钮点击
$("#updateModel").click(function(){
var pageNum = $("#goPageNo").val();
$.dialog({
title: "提醒",
content:"确定修改模型？",
ok: function(){location.href="${ctx}/AnalysisSupport/RuleConfiguration?qualityRuleId="+ruleId+"&rulePageNum="+pageNum;},
okValue:"确定",
cancel: function(){},
cancelValue:"取消",
lock:true
});
//查看准确性规则
function lookParm(qualityRuleId){
$.dialog({
title:"准确性规则",
content:"<div id='paramList'>"+
"<div class='col-xs-12'><div class='panel panel-default'><div class='panel-heading'>参数列表</div><div class='panel-body'> <table class='table table-hover table-striped'> <thead> <tr> <th width='20%'>参数ID号</th> <th width='35%'>参数名</th> <th width='20%'>参数值</th> <th width='25%'>参数类型</th> </tr> </thead> <tbody> </tbody> </table> </div> </div> </div>"+
"</div>",
lock:true,
width:800,
initialize:function(){
$.ajax({
type : 'GET',
contentType : 'application/json',
url: "${ctx}/AnalysisSupport/QualityRuleResult/findAccuracy?qualityRuleId="+qualityRuleId,
dataType : 'text',
beforeSend: function(data) {
},
success: function(data){
for(var i=0;i<data.length;i++){
if(data[i]=='\"'){
data=data.replace('\"','\'');
}
}
data=eval("("+data+")");
if(data!=null && data!=""){
var paramTbody = $('#paramList tbody');
for(var i=0;i<data.length;i++){
if(data[i].parameterValue=="undefined" || data[i].parameterValue==null || data[i].parameterValue==""){
data[i].parameterValue="";
}
paramTbody.append($("<tr></tr>").append("<td>"+data[i].parameterId+"</td>")
.append("<td>"+data[i].parameterName+"</td>")
.append("<td>"+data[i].parameterValue+"</td>")
.append("<td>"+data[i].parameterDataType+"</td>"));
}
}
}
});
}
});
}
});
}
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/webapp/static/js/ruleResultDetailTable.js
View file @ 25299f62
...@@ -128,17 +128,16 @@ function ruleResultDetailTable(){ ...@@ -128,17 +128,16 @@ function ruleResultDetailTable(){
header[0] = ["","<input type='radio' name='update'id='update' onclick='javascript:radioChoose(this);'/>","1%",""]; header[0] = ["","<input type='radio' name='update'id='update' onclick='javascript:radioChoose(this);'/>","1%",""];
header[1] = ["质量规则ID","qualityRuleId","7%","15"]; header[1] = ["质量规则ID","qualityRuleId","7%","15"];
header[2] = ["省份","provinceName","7%","15"]; header[2] = ["数据来源","dataSourceName","7%","15"];
header[3] = ["渠道","qualityRuleId","7%","15"]; header[3] = ["渠道","channelName","7%","15"];
header[4] = ["业务","qualityRuleId","7%","15"]; header[4] = ["业务","businessName","7%","15"];
header[5] = ["数据来源","qualityRuleId","7%","15"]; header[5] = ["指标名称","qualityRuleId","7%","15"];
header[6] = ["数据采集频率","qualityRuleId","7%","15"]; header[6] = ["指标编码","qualityRuleId","7%","15"];
header[7] = ["指标监控时间","qualityRuleId","7%","15"]; header[7] = ["数据类型","qualityRuleId","7%","15"];
header[8] = ["指标监控时间范围","qualityRuleId","7%","15"]; header[8] = ["数据采集频率","qualityRuleId","7%","15"];
header[9] = ["完整性阈值","qualityRuleId","7%","15"]; header[9] = ["指标监控时间","qualityRuleId","7%","15"];
header[10] = ["及时性阈值","qualityRuleId","7%","15"]; header[10] = ["指标业务时间","qualityRuleId","7%","15"];
header[11] = ["数据类型","qualityRuleId","7%","15"]; header[11] = ["准确性规则","qualityRuleId","7%","15"];
header[12] = ["准确性规则","qualityRuleId","7%","15"];
window.pagging = new table_pagging({limit:12,tableId:'ruleResultTable',header:header}); window.pagging = new table_pagging({limit:12,tableId:'ruleResultTable',header:header});
//pagging.pagging(jsonData); //pagging.pagging(jsonData);
...@@ -299,17 +298,6 @@ table_pagging.prototype = { ...@@ -299,17 +298,6 @@ table_pagging.prototype = {
tdContext = "&nbsp;"; tdContext = "&nbsp;";
} }
/*if(K==3){
if(tdContext!="&nbsp;"){
var strLength = tdContext.lastIndexOf(".");
var strBody = tdContext.substring(0,strLen-14);
var strExt = tdContext.substring(strLen);
tdContext=strBody+strExt;
}
}*/
// if(k==12){ //显示协查单的详细列表
// tdContext= "<a target='_blank' href='/CmszMonitorAnalysis/MonitorOperation/WorkingOrderReasult?xcdId="+this.getData(this.objectlist[i],this.header[k][1])+"'>"+ tdContext+"</a>"
if(k==9){ if(k==9){
if(tdContext!="&nbsp;"){ if(tdContext!="&nbsp;"){
...@@ -323,8 +311,8 @@ table_pagging.prototype = { ...@@ -323,8 +311,8 @@ table_pagging.prototype = {
} }
} }
if(k==11){ if(k==11){
tdContext = "<a href='javascript:;' onclick='lookParm(\""+this.getData(this.objectlist[i],"dataModelId")+"\",\""+this.getData(this.objectlist[i],"dataModelName")+"\")'>查看参数</a>"; tdContext = "<a href='javascript:;' onclick='lookParm(\""+this.getData(this.objectlist[i],"qualityRuleId")+"\")'>查看参数</a>";
//tdContext = "<a href='javascript:;' onclick=\"openDialog('"+this.getData(this.objectlist[i],"dataModelId")+"','"+ this.getData(this.objectlist[i],"dataModelName")"')\">查看参数</a>";
} }
if(k==4){ if(k==4){
if (this.header[k][4] && !(tdContext == "&nbsp;")) { if (this.header[k][4] && !(tdContext == "&nbsp;")) {
...@@ -363,13 +351,7 @@ table_pagging.prototype = { ...@@ -363,13 +351,7 @@ table_pagging.prototype = {
+ ".."; + "..";
} }
} }
console.log(tdContext); console.log(tdContext);
td.innerHTML = tdContext; td.innerHTML = tdContext;
...@@ -557,8 +539,8 @@ table_pagging.prototype = { ...@@ -557,8 +539,8 @@ table_pagging.prototype = {
if(clickObj.checked){ if(clickObj.checked){
//alert(clickObj); //alert(clickObj);
//alert(clickObj.nextSibling.innerHTML); //alert(clickObj.nextSibling.innerHTML);
$("#updateModel").attr("disabled", false); $("#updateRule").attr("disabled", false);
modelId=parseInt(obj[parseInt(clickObj.nextSibling.innerHTML)].dataModelId); ruleId=parseInt(obj[parseInt(clickObj.nextSibling.innerHTML)].qualityRuleId);
} }
} }
\ No newline at end of file
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