过滤规则维护

src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java

@@ -66,7 +66,8 @@ public class TaskManageController {
     @Autowired
     private EWarningCalcResultDao eWarningCalcResultDao;
 
-
+    @Autowired
+    private SystemParameterDao systemParameterDao;
 
 
     @RequestMapping(value = "/taskHome")
@@ -333,9 +334,10 @@ public class TaskManageController {
     @ResponseBody
     public APPEWarningDetail ModelPreview(String id){
         APPEWarningDetail app =null;
+        String modelSavePath = systemParameterDao.findByParameterName("MODEL_SCRIPT_FILE_DIR").get(0).getParameterValue();
 
         RunTask rt = runTaskService.getRunTask(Long.parseLong(id));
-        String path = "/home/dsadm/ETL/test/"+rt.getDataModelView().getModelScriptName()+" "+id;
+        String path =modelSavePath+rt.getDataModelView().getModelScriptName()+" "+id;
 //        String path ="d:\\rscript\\a.r";
         try {
             Runtime run = Runtime.getRuntime();// 返回与当前 Java 应用程序相关的运行时对象
@@ -375,8 +377,10 @@ public class TaskManageController {
     };
     @RequestMapping(value = "/modelPreviewImg")
     public void ModelPreview(HttpServletResponse response,String path){
-        System.out.println("fileName:"+path);
-        File file = new File("/home/dsadm/ETL/test/"+path);
+//        System.out.println("fileName:"+path);
+        String modelSavePath = systemParameterDao.findByParameterName("MODEL_SCRIPT_FILE_DIR").get(0).getParameterValue();
+
+        File file = new File(modelSavePath+"img"+path);
 //        File file = new File("d:\\rscript\\al.jpg");
         FileInputStream fis;
         try {

src/main/java/com/hp/cmsz/web/modelmanage/ModelMaintainController.java

@@ -253,10 +253,10 @@ public class ModelMaintainController {
 					ftpFileInput.close();
 					ftpClient.logout();
 					ftpClient.disconnect();
-					File oldFile = new File(modelSavePath,ftpFileName);
-					if(oldFile.isFile() && oldFile.exists()){
-						oldFile.delete();
-					}
+//					File oldFile = new File(modelSavePath,ftpFileName);
+//					if(oldFile.isFile() && oldFile.exists()){
+//						oldFile.delete();
+//					}
 				} catch (SocketException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();

src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp

@@ -151,6 +151,7 @@ $(".ifRepeate").change(function (){
             $unit.append(new Option("月",3))
 
 		}else{
+            var msg ="";
             alertMsg.forEach(function (t,i) {
                 msg+="<span style='color: red'>"+(i+1)+"."+t+"</span><br />"
             });

src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp

@@ -130,7 +130,7 @@
             kpiName:'${list.kpiName}',businessId:'${list.businessId}'});
     </c:forEach>
 	var dataSourceList = [];
-    <c:forEach var="list" items="${dataSourceList}">
+    <c:forEach var="list" items="${datasourceList}">
     	dataSourceList.push({dataSourceName:'${list.dataSourceName}', dataSourceId:'${list.dataSourceId}'});
     </c:forEach>
 	filterResultDetailTable();

src/main/webapp/static/js/filterResultDetailTable.js

@@ -203,7 +203,6 @@ table_pagging.prototype = {
 
 		},
 		pagging : function(objectJson) {
-			console.log(objectJson)
 			this.objectlist = eval('(' + objectJson + ')');
 
 			if (this.start + this.limit >= this.objectlist.length) {