!6 页面

Merge pull request !6 from 邓相虎/master

infosouth-admin/.settings/org.eclipse.core.resources.prefs

@@ -5,5 +5,5 @@ encoding//src/main/resources/static/css/login.css=UTF-8
 encoding//src/main/resources/static/ruoyi/css/ry-ui.css=UTF-8
 encoding//src/main/resources/templates/arj21/csvmanager/add.html=UTF-8
 encoding//src/main/resources/templates/arj21/csvmanager/edit.html=UTF-8
-encoding//src/main/resources/templates/arj21/csvmanager/flight.html=UTF-8
+encoding//src/main/resources/templates/arj21/csvmanager/qarDataExport.html=UTF-8
 encoding/<project>=UTF-8

infosouth-admin/src/main/resources/static/oneself/customer_js/CronExpressionValidator.js

@@ -0,0 +1,334 @@
+ /**
+     * Validates a cron expression.
+     *
+     * @param cronExpression The expression to validate
+     * @return True is expression is valid
+     */
+    function cronValidate(cronExpression ){
+        //alert("校验函数的开始！");
+        var cronParams = cronExpression.split(" ");
+
+        if (cronParams.length < 6 || cronParams.length > 7) {
+            return false;
+        }
+
+        //CronTrigger cronTrigger = new CronTrigger();
+        //cronTrigger.setCronExpression( cronExpression );
+
+        if (cronParams[3] == "?" || cronParams[5]=="?") {
+            //Check seconds param
+            if (!checkSecondsField(cronParams[0])) {
+                return false;
+            }
+
+            //Check minutes param
+            if (!checkMinutesField(cronParams[1])) {
+                return false;
+            }
+
+            //Check hours param
+            if (!checkHoursField(cronParams[2])) {
+                return false;
+            }
+
+            //Check day-of-month param
+            if (!checkDayOfMonthField(cronParams[3])) {
+                return false;
+            }
+
+            //Check months param
+            if (!checkMonthsField(cronParams[4])) {
+                return false;
+            }
+
+            //Check day-of-week param
+            if (!checkDayOfWeekField(cronParams[5])) {
+                return false;
+            }
+
+            //Check year param
+            if (cronParams.length == 7) {
+                if (!checkYearField(cronParams[6])) {
+                    return false;
+                }
+            }
+
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    function checkSecondsField(secondsField) {
+        return checkField(secondsField, 0, 59);
+    }
+
+
+    function checkField(secondsField, minimal, maximal) {
+        if (secondsField.indexOf("-") > -1 ) {
+            var startValue = secondsField.substring(0, secondsField.indexOf( "-" ));
+            var endValue = secondsField.substring(secondsField.indexOf( "-" ) + 1);
+
+            if (!(checkIntValue(startValue, minimal, maximal, true) && checkIntValue(endValue, minimal, maximal, true))) {
+                return false;
+            }
+            try {
+                var startVal = parseInt(startValue, 10);
+                var endVal = parseInt(endValue, 10);
+
+                return endVal > startVal;
+            } catch (e) {
+                return false;
+            }
+        } else if (secondsField.indexOf(",") > -1) {
+            return checkListField(secondsField, minimal, maximal);
+        } else if (secondsField.indexOf( "/" ) > -1) {
+            return checkIncrementField( secondsField, minimal, maximal );
+        } else if (secondsField.indexOf( "*" ) != -1) {
+            return true;
+        } else {
+            return checkIntValue(secondsField, minimal, maximal);
+        }
+    }
+
+    function checkIntValue(value, minimal, maximal, checkExtremity) {
+        try {
+            var val = parseInt(value, 10);
+            //判断是否为整数
+            if (value == val) {
+                if (checkExtremity) {
+                    if (val < minimal || val > maximal) {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            return false;
+        } catch (e) {
+            return false;
+        }
+    }
+
+    function checkMinutesField(minutesField) {
+        return checkField(minutesField, 0, 59);
+    }
+
+    function checkHoursField(hoursField) {
+        return checkField(hoursField, 0, 23);
+    }
+
+    function checkDayOfMonthField(dayOfMonthField) {
+        if (dayOfMonthField == "?") {
+            return true;
+        }
+
+        if (dayOfMonthField.indexOf("L") >= 0) {
+            return checkFieldWithLetter(dayOfMonthField, "L", 1, 7, -1, -1);
+        } else if ( dayOfMonthField.indexOf("W") >= 0) {
+            return checkFieldWithLetter(dayOfMonthField, "W", 1, 31, -1, -1);
+        } else if (dayOfMonthField.indexOf("C") >= 0) {
+            return checkFieldWithLetter(dayOfMonthField, "C", 1, 31, -1, -1);
+        } else {
+            return checkField( dayOfMonthField, 1, 31 );
+        }
+    }
+
+
+    function checkMonthsField(monthsField) {
+/*        monthsField = StringUtils.replace( monthsField, "JAN", "1" );
+        monthsField = StringUtils.replace( monthsField, "FEB", "2" );
+        monthsField = StringUtils.replace( monthsField, "MAR", "3" );
+        monthsField = StringUtils.replace( monthsField, "APR", "4" );
+        monthsField = StringUtils.replace( monthsField, "MAY", "5" );
+        monthsField = StringUtils.replace( monthsField, "JUN", "6" );
+        monthsField = StringUtils.replace( monthsField, "JUL", "7" );
+        monthsField = StringUtils.replace( monthsField, "AUG", "8" );
+        monthsField = StringUtils.replace( monthsField, "SEP", "9" );
+        monthsField = StringUtils.replace( monthsField, "OCT", "10" );
+        monthsField = StringUtils.replace( monthsField, "NOV", "11" );
+        monthsField = StringUtils.replace( monthsField, "DEC", "12" );*/
+
+        monthsField.replace("JAN", "1");
+        monthsField.replace("FEB", "2");
+        monthsField.replace("MAR", "3");
+        monthsField.replace("APR", "4");
+        monthsField.replace("MAY", "5");
+        monthsField.replace("JUN", "6");
+        monthsField.replace("JUL", "7");
+        monthsField.replace("AUG", "8");
+        monthsField.replace("SEP", "9");
+        monthsField.replace("OCT", "10");
+        monthsField.replace("NOV", "11");
+        monthsField.replace("DEC", "12");
+
+        return checkField(monthsField, 1, 31);
+    }
+
+    function checkDayOfWeekField(dayOfWeekField) {
+/*        dayOfWeekField = StringUtils.replace( dayOfWeekField, "SUN", "1" );
+        dayOfWeekField = StringUtils.replace( dayOfWeekField, "MON", "2" );
+        dayOfWeekField = StringUtils.replace( dayOfWeekField, "TUE", "3" );
+        dayOfWeekField = StringUtils.replace( dayOfWeekField, "WED", "4" );
+        dayOfWeekField = StringUtils.replace( dayOfWeekField, "THU", "5" );
+        dayOfWeekField = StringUtils.replace( dayOfWeekField, "FRI", "6" );
+        dayOfWeekField = StringUtils.replace( dayOfWeekField, "SAT", "7" );*/
+
+        dayOfWeekField.replace("SUN", "1" );
+        dayOfWeekField.replace("MON", "2" );
+        dayOfWeekField.replace("TUE", "3" );
+        dayOfWeekField.replace("WED", "4" );
+        dayOfWeekField.replace("THU", "5" );
+        dayOfWeekField.replace("FRI", "6" );
+        dayOfWeekField.replace("SAT", "7" );        
+
+        if (dayOfWeekField == "?") {
+            return true;
+        }
+
+        if (dayOfWeekField.indexOf("L") >= 0) {
+            return checkFieldWithLetter(dayOfWeekField, "L", 1, 7, -1, -1);
+        } else if (dayOfWeekField.indexOf("C") >= 0) {
+            return checkFieldWithLetter(dayOfWeekField, "C", 1, 7, -1, -1);
+        } else if (dayOfWeekField.indexOf("#") >= 0) {
+            return checkFieldWithLetter(dayOfWeekField, "#", 1, 7, 1, 5);
+        } else {
+            return checkField(dayOfWeekField, 1, 7);
+        }
+    }
+
+    function checkYearField(yearField) {
+        return checkField(yearField, 1970, 2099);
+    }
+
+
+    function checkFieldWithLetter(value, letter, minimalBefore, maximalBefore,
+                                          minimalAfter, maximalAfter) {
+        var canBeAlone = false;
+        var canHaveIntBefore = false;
+        var canHaveIntAfter = false;
+        var mustHaveIntBefore = false;
+        var mustHaveIntAfter = false;
+
+        if (letter == "L") {
+            canBeAlone = true;
+            canHaveIntBefore = true;
+            canHaveIntAfter = false;
+            mustHaveIntBefore = false;
+            mustHaveIntAfter = false;
+        }
+        if (letter == "W" || letter == "C") {
+            canBeAlone = false;
+            canHaveIntBefore = true;
+            canHaveIntAfter = false;
+            mustHaveIntBefore = true;
+            mustHaveIntAfter = false;
+        }
+        if (letter == "#") {
+            canBeAlone = false;
+            canHaveIntBefore = true;
+            canHaveIntAfter = true;
+            mustHaveIntBefore = true;
+            mustHaveIntAfter = true;
+        }
+
+        var beforeLetter = "";
+        var afterLetter = "";
+
+        if (value.indexOf(letter) >= 0 ) {
+            beforeLetter = value.substring( 0, value.indexOf(letter));
+        }
+
+        if (!value.endsWith(letter)) {
+            afterLetter = value.substring( value.indexOf( letter ) + 1 );
+        }
+
+        if (value.indexOf(letter) >= 0) {
+            if (letter == value) {
+                return canBeAlone;
+            }
+
+            if (canHaveIntBefore) {
+                if (mustHaveIntBefore && beforeLetter.length == 0) {
+                    return false;
+                }
+
+                if (!checkIntValue(beforeLetter, minimalBefore, maximalBefore, true)){
+                    return false;
+                }
+            } else {
+                if (beforeLetter.length > 0 ) {
+                    return false;
+                }
+            }
+
+            if (canHaveIntAfter) {
+                if ( mustHaveIntAfter && afterLetter.length == 0 ) {
+                    return false;
+                }
+
+                if (!checkIntValue(afterLetter, minimalAfter, maximalAfter, true)) {
+                    return false;
+                }
+            } else {
+                if (afterLetter.length > 0) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+/*    function checkIntValue(value, minimal, maximal) {
+        return checkIntValue(value, minimal, maximal, true);
+    } */
+
+    function checkIncrementField(value, minimal, maximal) {
+        var start = value.substring(0, value.indexOf("/"));
+
+        var increment = value.substring(value.indexOf("/") + 1);
+
+        if (!("*" == start)) {
+            return checkIntValue(start, minimal, maximal, true) && checkIntValue(increment, minimal, maximal, false);
+        } else {
+            return checkIntValue(increment, minimal, maximal, true);
+        }
+    }
+
+
+
+    function checkListField(value, minimal, maximal ) {
+        var st = value.split(",");
+
+        var values = new Array(st.length);
+
+        for(var j = 0; j < st.length; j++) {
+            values[j] = st[j];
+        }
+
+        var previousValue = -1;
+
+        for (var i= 0; i < values.length; i++) {
+            var currentValue = values[i];
+
+            if (!checkIntValue(currentValue, minimal, maximal, true)) {
+                return false;
+            }
+
+            try {
+                var val = parseInt(currentValue, 10);
+
+                if (val <= previousValue) {
+                    return false;
+                } else {
+                    previousValue = val;
+                }
+            } catch (e) {
+                // we have always an int
+            }
+        }
+
+        return true;
+    }

infosouth-admin/src/main/resources/static/oneself/customer_js/analysis/model_keypoint_paramInfo.js

@@ -0,0 +1,586 @@
+var model_keypoint_paramInfo_locat = (window.location+'').split('/'); 
+var model_keypoint_paramInfo_locate_url = '';
+$(function(){
+	model_keypoint_paramInfo_locat =  model_keypoint_paramInfo_locat[0]+'//'+model_keypoint_paramInfo_locat[2]+'/'+model_keypoint_paramInfo_locat[3];
+	model_keypoint_paramInfo_locate_url = model_keypoint_paramInfo_locat + '/a';
+
+});
+
+
+
+//每一个参数对应固定的颜色数组
+var models_keypoint_params_colorArr = [];
+//每个模型点击事件
+$("#tbody_model_name").on("click","tr",function(){  
+	$(this).addClass('selected') //为选中项添加高亮
+	.siblings().removeClass('selected')//去除其他项的高亮形式
+	.end();
+	//根据contentTableName 确定变色的行
+	tagscheckByContentTableName('contentTable1',this);
+	 //显示遮罩层    
+	show_zhezhao_mask();
+	//显示加载中提示
+    show_loading_tips();
+	
+	var trclass = $(this).attr("class");
+	var trclassArr = trclass.replace(' selected','');
+	var lineId = trclassArr;
+	//除去 selected 标签
+	
+	var keyPointName = lineId;
+
+	var req_jobId = $("#jobId").val();
+		
+	//重置每一个参数对应固定的颜色数组
+	models_keypoint_params_colorArr = [];
+	
+	$.ajax({
+		type: "POST",
+		url: model_keypoint_paramInfo_locate_url+'/analysis/modelResultShow/getKeyPointData',
+    	data: {jobId:req_jobId,keyPointName:keyPointName},
+		dataType:'json',
+		cache: false,
+		success: function(data){	
+			//隐藏遮罩层  
+		    hide_zhezhao_mask();
+		  	//隐藏加载中提示
+		    hide_loading_tips();
+			if(data.status=='1001'){
+				var returnData = [];
+				returnData = data.data;	
+				var models_keypoint_fileNames = returnData.models_keypoint_fileNames;
+				if(models_keypoint_fileNames==null||models_keypoint_fileNames==undefined){
+					oDateAlert('没有执行的csv文件！没有结果数据');
+					return false;
+				}
+				//文件名列表
+				var fileNameArr = models_keypoint_fileNames.fileNameArr;
+				var models_keypoint_paramsArr = returnData.models_keypoint_paramsArr;
+				var fileNameHtml = "";
+				if(fileNameArr==undefined||fileNameArr==''){
+					oDateAlert('没有执行的csv文件！没有结果数据');
+					return false;
+				}
+				for(var i=0;i<fileNameArr.length;i++){
+					var paramObj = fileNameArr[i];
+					fileNameHtml += "<tr class=\""+paramObj.keyPointName+"-"+"csv-"+i+"\">";
+					fileNameHtml += "<td class='center' style=\"width: 30px;\">";
+					fileNameHtml += "<input type='checkbox' name=\"checkbox_name_file\" value=\""+paramObj.keyPointName+";"+parseInt(i+1)+";"+paramObj.fileName+"\" id=\"checkbox_file_"+parseInt(i+1)+"\" alt=\"\"/>";
+					fileNameHtml += "</td>";
+					fileNameHtml += "<td class='center' style=\"width: 30px;\">";
+					fileNameHtml += 'csv'+parseInt(i+1);
+					fileNameHtml += "</td>";
+					fileNameHtml += "<td>";
+					keyPointNameTemp = paramObj.keyPointName;
+					if(keyPointNameTemp.length>20){
+						keyPointNameTemp = keyPointNameTemp.keyPointNameTemp(0,20)+'...';
+					}
+					fileNameHtml += keyPointNameTemp;
+					fileNameHtml += "</td>";
+					fileNameHtml += "<td>";
+					fileNameTemp = paramObj.fileName;
+					if(fileNameTemp.length>20){
+						fileNameTemp = fileNameTemp.substring(0,20)+'...';
+					}
+					fileNameHtml += fileNameTemp;
+					fileNameHtml += "</td>";					
+					fileNameHtml += "</tr>";
+				}
+				$("#tbody_files_name").empty();
+				$("#tbody_files_name").append(fileNameHtml);
+				
+				var paramshtml = "";
+				for(var i=0;i<models_keypoint_paramsArr.length;i++){
+					var models_keypoint_paramsObj = models_keypoint_paramsArr[i];
+					paramshtml += "<tr class=\""+models_keypoint_paramsObj.keyPointName+"-"+models_keypoint_paramsObj.paramName+"\">";
+					
+					paramshtml += "<td class='center' style=\"width: 30px;\">";
+					paramshtml += "<input type='checkbox' name=\"checkbox_name"+parseInt(i+1)+"\" value=\""+models_keypoint_paramsObj.keyPointName+";"+parseInt(i+1)+";"+models_keypoint_paramsObj.paramName+"\" id=\"checkbox_param_"+parseInt(i+1)+"\" alt=\"\"/>";
+					paramshtml += "</td>";
+					paramshtml += "<td>";
+					keyPointNameTemp = models_keypoint_paramsObj.keyPointName;
+					if(keyPointNameTemp.length>20){
+						keyPointNameTemp = keyPointNameTemp.keyPointNameTemp(0,20)+'...';
+					}
+					paramshtml += keyPointNameTemp;
+					paramshtml += "</td>";
+					paramshtml += "<td class=\""+models_keypoint_paramsObj.paramName+"_class\">";
+					paramshtml += models_keypoint_paramsObj.paramName;
+					paramshtml += "</td>";
+					
+					
+					paramshtml += "</tr>";
+					
+					//给每个参数添加显示的颜色序号
+					models_keypoint_params_colorArr.push({"paramName_k":models_keypoint_paramsObj.paramName,"color_index":i});
+				}
+				$("#tbody_params_name").empty();
+				$("#tbody_params_name").append(paramshtml);
+				//重置全选勾选框
+				$("#checkAll").attr("checked",this.checked==true?false:false);
+				//清空x轴范围设定
+			 	customer_x_field = [];
+			 	//清空y轴范围设定
+				customer_y_field = [];
+				oDateAlert('查询参数成功！');
+			}else if(data.status=='1002'){
+				oDateAlert('没有数据，请重新请求任务');
+				console.log('没有数据，请重新请求任务');
+				return;
+			}else if(data.status=='1003'){
+				oDateAlert('没有数据，请重新请求任务！');
+				console.log('没有数据，请重新请求任务！');
+				return;
+			}else if(data.status=='1004'){
+				oDateAlert('Id为空，请重新请求任务');
+				console.log('Id为空，请重新请求任务');
+				return;
+			}else if(data.status=='1005'){
+				oDateAlert('jobId为空，请重新请求任务');
+				console.log('jobId为空，请重新请求任务');
+				return;
+			}
+			console.log('成功');
+		}
+	});
+	//注销之前的图形缓存，1个以上的图表	
+	disposeHistoryChatObjArr();
+	//如果没有勾选参数，清除图表上方的参数名，清除勾选框,反之，加上勾选框
+  	clearParamsTitle('');
+	console.log('加载模型数据成功');
+
+});
+
+$('#checkAll').on('change', function() {
+	//显示遮罩层    
+	show_zhezhao_mask();
+	//显示加载中提示
+    show_loading_tips();
+    
+    //获取已勾选的JobId_modelName_paramsName
+	var choosedDataObj = getJobId_modelName_paramsName();
+   
+	var req_jobId = choosedDataObj.req_jobId;
+	var keyPointName = choosedDataObj.keyPointName;
+	var paramsNameStr = choosedDataObj.paramsNameStr;
+	if(req_jobId==undefined){
+		req_jobId = '';
+	}
+	if(keyPointName==undefined){
+		keyPointName = '';
+	}
+	if(paramsNameStr==undefined||paramsNameStr==''||paramsNameStr=='undefined'){
+		//隐藏遮罩层  
+	    hide_zhezhao_mask();
+	  	//隐藏加载中提示
+	    hide_loading_tips();
+		if($(this).prop("checked")){
+			$(this).attr("checked",this.checked==true?false:false);
+			oDateAlert('请先勾选参数');
+		}
+		return;
+	}
+	var isAllCsvFlag='1';
+	var csvFileNamesStr = '';
+	var isChooseParamFlag = '0';
+	
+	console.log('------------checkbox choose--start---------------');
+	var ischecked = $(this).prop("checked");  
+    if(ischecked){
+    	var checkboxValue = $(this).attr('value');
+    	$("input[name='checkbox_name_file'").prop('checked', $(this).prop("checked"));
+    	//var filesNameStr = getCheckedFiles();
+    	//有勾选
+    	//drawCharts(models_result_paramsArr_data,filesNameStr);
+    	//req_refresh_chart_by_condition(models_result_paramsArr_data,'allFiles');    	
+    }else{
+    	$('[name=checkbox_name_file]:checkbox').each(function(){
+    		$(this).attr("checked",this.checked==true?false:false);
+    	});
+    	//var filesNameStr = getCheckedFiles();
+    	//没有勾选
+    	//req_refresh_chart_by_condition(models_result_paramsArr_data,filesNameStr);
+    	
+    	isAllCsvFlag = '0';	
+    }
+    console.log('------------checkbox choose--end---------------');
+    //获取服务端相关的参数，csv文件数据，并绘图
+	getParamsArrDataToChart(choosedDataObj.req_jobId,choosedDataObj.keyPointName,choosedDataObj.paramsNameStr,isAllCsvFlag,csvFileNamesStr,isChooseParamFlag);
+   
+});
+
+
+//所有文件点过的checkbox
+var clicked_files_checkboxValue = '';
+var filesNameStr = '';
+//每个文件点击点击事件
+$("#tbody_files_name").on("click","input[type='checkbox']",function(){
+	
+	var tbodyObj = document.getElementById('tbody_files_name');  
+        
+	//var filesNameStr = getCheckedFiles();
+	//req_refresh_chart_by_condition(models_result_paramsArr_data,filesNameStr);
+	
+	//获取已勾选的JobId_modelName_paramsName
+	var choosedDataObj = getJobId_modelName_paramsName();    
+	var req_jobId = choosedDataObj.req_jobId;
+	var keyPointName = choosedDataObj.keyPointName;
+	var paramsNameStr = choosedDataObj.paramsNameStr;
+	if(req_jobId==undefined){
+		req_jobId = '';
+	}
+	if(keyPointName==undefined){
+		keyPointName = '';
+	}
+	if(paramsNameStr==undefined||paramsNameStr==''||paramsNameStr=='undefined'){
+		if($(this).prop("checked")){
+			$(this).attr("checked",this.checked==true?false:false);
+			oDateAlert('请先勾选参数');
+			console.log('请先勾选参数');
+		}
+		return;
+	}
+	var checkboxValue_csvFileId = $(this)[0].id;
+	var isAllCsvFlag='2';
+	if(isChoosed_CheckAll_CheckBox_Tag()){		
+		isAllCsvFlag = '1';
+		$(this).attr("checked",this.checked==true?true:true);
+		oDateAlert('请先取消全选');
+		console.log('请先取消全选');
+		return;
+	}
+	
+	var csvFileNamesStr = getCheckedFiles(checkboxValue_csvFileId,isAllCsvFlag);
+	if(csvFileNamesStr=='checkAllFlag'){
+		oDateAlert('勾选更多csv文件，请选择全选功能');
+		console.log('勾选更多csv文件，请选择全选功能');
+		return;
+	}
+	var isChooseParamFlag = '0';
+	//获取服务端相关的参数，csv文件数据，并绘图
+	getParamsArrDataToChart(req_jobId,keyPointName,paramsNameStr,isAllCsvFlag,csvFileNamesStr,isChooseParamFlag);
+	
+});
+
+//获取勾选的文件名
+function getCheckedFiles(checkboxId,isAllCsvFlag){
+	if(isAllCsvFlag!='1'&&isAllCsvFlag!=1){
+		clicked_files_checkboxValue = '';
+		console.log('------------checkbox choose--start---------------');
+	    $("#contentTable3 tr").find("td:first input:checkbox").each(function () {  
+	        var ischecked = $(this).prop("checked");  
+	        if(ischecked){
+	        	var checkboxValue = $(this).attr('value');
+	        	clicked_files_checkboxValue += checkboxValue+',';
+	        }
+	        
+			 });
+	    console.log('------------checkbox choose--end---------------');
+		
+		$(this).addClass('selected') //为选中项添加高亮
+		.siblings().removeClass('selected')//去除其他项的高亮形式
+		.end();	
+		//根据contentTableName 确定变色的行
+		tagscheckByContentTableName('contentTable3',this);
+		
+		var trclassArr = clicked_files_checkboxValue.substring(0,clicked_files_checkboxValue.length-1).split(",");
+		//如果勾选超过30个，给出一个全选提示
+		if(trclassArr!=''&&trclassArr!=undefined&&trclassArr.length>30){
+			
+			$('#'+checkboxId).attr("checked",this.checked==true?false:false);			
+			return 'checkAllFlag';
+		}
+		var keyPointName = '';
+		filesNameStr = '';
+		for(var i=0;i<trclassArr.length;i++){
+			var lineId = trclassArr[i];
+			//除去 selected 标签
+			var fidStr = lineId.split(';');
+			//获取关键点名
+			keyPointName = fidStr[0];
+			var linei = fidStr[1];
+			filesNameStr+=fidStr[2]+',';
+
+		}
+		
+		//包含选择过的参数
+		filesNameStr = filesNameStr.substring(0,filesNameStr.length-1);
+		if(filesNameStr=='undefined'||filesNameStr==undefined){
+			filesNameStr = '';
+		}
+		return filesNameStr;
+	}else{
+		return '';
+	}
+	
+}
+
+//页面总高度
+var page_total_height = 780;
+//所有点过的checkbox
+var clicked_checkboxValue = '';
+var paramsNameStr = '';
+var myLineChartArr = [];
+var models_result_paramsArr_data = [];
+var paramValue_jArr_X_k = [];	
+//每个参数点击事件
+$("#tbody_params_name").on("click","input[type='checkbox']",function(){		
+	clicked_checkboxValue = '';
+	var tbodyObj = document.getElementById('tbody_params_name');  
+        
+    console.log('------------checkbox choose--start---------------');
+    $("#contentTable2 tr").find("td:first input:checkbox").each(function () {  
+        var ischecked = $(this).prop("checked");  
+        if(ischecked){
+        	var checkboxValue = $(this).attr('value');
+        	clicked_checkboxValue += checkboxValue+',';
+        }
+        
+		 });
+    console.log('------------checkbox choose--end---------------');
+	
+	$(this).addClass('selected') //为选中项添加高亮
+	.siblings().removeClass('selected')//去除其他项的高亮形式
+	.end();
+	//根据contentTableName 确定变色的行
+	tagscheckByContentTableName('contentTable2',this);
+	
+	var trclassArr = clicked_checkboxValue.substring(0,clicked_checkboxValue.length-1).split(",");
+	var keyPointName = '';
+	paramsNameStr = '';
+	if(trclassArr.length>3){
+		$(this).attr("checked",this.checked==true?false:false);
+		oDateAlert('一个页面最多只能显示3个图表');
+		console.log('返回异常，一个页面最多只能显示3个图表');
+		return;
+	}		
+	for(var i=0;i<trclassArr.length;i++){
+		var lineId = trclassArr[i];
+		//除去 selected 标签
+		var fidStr = lineId.split(';');
+		//获取关键点名
+		keyPointName = fidStr[0];
+		var linei = fidStr[1];
+		paramsNameStr+=fidStr[2]+',';
+				
+
+	}
+	
+	
+	//是否勾选该参数
+	var ischecked = $(this).prop("checked");  
+    if(ischecked){
+		//黑色
+    	redcolor = 0;
+    	greencolor = 0;
+    	bluecolor = 0;
+    }else{
+    	//灰色
+    	cancel_choosed_color = 85;
+    	
+    	//将取消勾选的参数置为灰色,默认颜色----------------------------------------------------------
+    	var cancel_choosed_paramName = $(this).attr('value');
+    	cancel_choosed_paramNameTempArr = [];
+    	cancel_choosed_paramNameTempArr = cancel_choosed_paramName.split(";");
+    	if(cancel_choosed_paramNameTempArr.length>2){
+    		var cancel_choosed_param_fontColor = "rgba("+cancel_choosed_color+","+cancel_choosed_color+","+cancel_choosed_color+",1)";
+    		$("."+cancel_choosed_paramNameTempArr[2]+"_class").css({"color":cancel_choosed_param_fontColor});
+    	}
+    	//将取消勾选的参数置为灰色----------------------------------------------------------
+    }
+	
+	//包含选过的参数
+	paramsNameStr = paramsNameStr.substring(0,paramsNameStr.length-1);		
+	//如果没有勾选参数，清除图表上方的参数名，清除勾选框,反之，加上勾选框
+	clearParamsTitle(paramsNameStr);
+	
+	
+	//获取该job计算后的模型数据
+	var req_jobId = $("#jobId").val();
+	//显示遮罩层    
+	show_zhezhao_mask();
+	//显示加载中提示
+    show_loading_tips();
+	
+    //不是全选，也不是空选
+	var isAllCsvFlag = '2'; 
+	//是否有勾选全选checkbox
+	if(isChoosed_CheckAll_CheckBox_Tag()){
+		isAllCsvFlag = '1';
+	}
+	//是否勾选参数操作
+	var isChooseParamFlag = '1';
+	//获取勾选的文件名
+	var csvFileNamesStr = getCheckedFiles('',isAllCsvFlag);
+	//获取服务端相关的参数，csv文件数据，并绘图
+	getParamsArrDataToChart(req_jobId,keyPointName,paramsNameStr,isAllCsvFlag,csvFileNamesStr,isChooseParamFlag);
+	console.log('ok');
+	
+});
+
+//获取服务端相关的参数，csv文件数据，并绘图
+function getParamsArrDataToChart(req_jobId,keyPointName,paramsNameStr,isAllCsvFlag,csvFileNamesStr,isChooseParamFlag){
+	//isAllCsvFlag:0,空选；isAllCsvFlag:1,全选；isAllCsvFlag:2不是全选，也不是空选	
+	//isChooseParamFlag，是否勾选参数操作
+		
+	//
+	$.ajax({
+		type: "POST",
+		url: model_keypoint_paramInfo_locate_url+'/analysis/modelResultShow/getParamsArrData',
+    	data: {jobId:req_jobId,keyPointName:keyPointName,paramName:paramsNameStr,isAllCsvFlag:isAllCsvFlag,csvFileNamesStr:csvFileNamesStr,isChooseParamFlag:isChooseParamFlag},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			//隐藏遮罩层  
+		    hide_zhezhao_mask();
+		  	//隐藏加载中提示
+		    hide_loading_tips();
+			if(data.status=='1001'){									
+				//获取result_paramsArr_data
+				var result_paramsArr_data = data.data;
+				//绘图
+				if(isChooseParamFlag==1||isChooseParamFlag=='1'){
+					req_refresh_chart(result_paramsArr_data);
+				}else{
+					req_refresh_chart_by_condition(result_paramsArr_data,csvFileNamesStr);
+				}
+
+				oDateAlert('绘图成功！');
+			}else if(data.status=='1002'){
+				oDateAlert('没有数据，请重新请求任务');
+				console.log('没有数据，请重新请求任务');
+				return;
+			}else if(data.status=='1003'){
+				oDateAlert('没有数据，请重新请求任务！');
+				console.log('没有数据，请重新请求任务！');
+				return;
+			}else if(data.status=='1004'){
+				oDateAlert('Id为空，请重新请求任务');
+				console.log('Id为空，请重新请求任务');
+				return;
+			}else if(data.status=='1005'){
+				oDateAlert('jobId为空，请重新请求任务');
+				console.log('jobId为空，请重新请求任务');
+				return;
+			}
+			console.log('成功');
+		}
+	});
+}
+
+
+
+/*模拟alert*/
+function oDateAlert(txt){
+	$('#date_alert').html(txt);
+ 	$('#date_alert').show();
+	setInterval(function(){
+		$('#date_alert').fadeOut();
+	},3000);
+}
+
+
+
+//颜色随机数
+	var redcolor = 0;
+	var bluecolor = 0;
+	var greencolor = 0;
+	function getColorNum(linei){
+		redcolor = 0;
+		bluecolor = 0;
+		greencolor = 360;
+		redcolor = redcolor + parseInt(linei*30);
+		bluecolor = bluecolor + parseInt(linei*180);
+		greencolor = greencolor - parseInt(linei*30);
+		if(redcolor>=360){
+			redcolor=0;
+		}
+	if(bluecolor>=360){
+		bluecolor=0;
+		}
+	if(greencolor<=0){
+		greencolor=360;
+	}
+	}
+	
+
+
+	//如果没有勾选参数，清除图表上方的参数名，清除勾选框,反之，加上勾选框
+	function clearParamsTitle(choose_paramsNameStr){
+		if(choose_paramsNameStr.length==0||choose_paramsNameStr==''||choose_paramsNameStr==','||choose_paramsNameStr==undefined||choose_paramsNameStr=="undefined"){
+			for(var i=0;i<3;i++){
+				$(parent.window.frames["modelResultShowDetail"].document).find(".showParamName_div"+i).empty();
+			}
+			//清除勾选框
+			$("#checkAll").attr("checked",this.checked==true?false:false);
+			$('[name=checkbox_name_file]:checkbox').each(function(){
+				$(this).attr("checked",this.checked==true?false:false);
+			});
+		}else{
+			//$("#checkAll").attr("checked",this.checked==true?true:true);
+			/* $('[name=checkbox_name_file]:checkbox').each(function(index,obj){
+				    		
+    	}); */
+		}
+	}
+	
+	//取消勾选参数
+	function clear_tbody_params_name(){
+		//
+		$("#contentTable2 tr").find("td:first input:checkbox").each(function () {  
+			$(this).attr("checked",this.checked==true?false:false);
+	        
+		});
+	}
+	
+	//触发清空右边图形的点击事件
+	function toggleClearChartClickEvent(){
+		//
+		$(parent.window.frames["modelResultShowDetail"].document).find("#clearChartClickEvent_a").click();
+	}
+	
+	
+	//获取已勾选的JobId_modelName_paramsName
+	function getJobId_modelName_paramsName(){
+		//获取该job计算后的模型数据
+		var req_jobId = $("#jobId").val();
+		
+		var clicked_checkboxValue_param = '';
+		var tbodyObj = document.getElementById('tbody_params_name');  
+	        
+	    console.log('------------checkbox choose--start---------------');
+	    $("#contentTable2 tr").find("td:first input:checkbox").each(function () {  
+	        var ischecked = $(this).prop("checked");  
+	        if(ischecked){
+	        	var checkboxValue = $(this).attr('value');
+	        	clicked_checkboxValue_param += checkboxValue+',';
+	        }
+	        
+		});
+	    console.log('------------checkbox choose--end---------------');
+		
+		var trclassArr = clicked_checkboxValue_param.substring(0,clicked_checkboxValue_param.length-1).split(",");
+		var keyPointName = '';
+		choosed_paramsNameStr = '';
+		
+		for(var i=0;i<trclassArr.length;i++){
+			var lineId = trclassArr[i];
+			//除去 selected 标签
+			var fidStr = lineId.split(';');
+			//获取关键点名
+			keyPointName = fidStr[0];
+			var linei = fidStr[1];
+			choosed_paramsNameStr+=fidStr[2]+',';
+		}
+		var choosedData = {"req_jobId":req_jobId,"keyPointName":keyPointName,"paramsNameStr":paramsNameStr};
+		return choosedData;		
+	}
+
+	//是否有勾选全选checkbox
+	function isChoosed_CheckAll_CheckBox_Tag(){
+		var ischecked = $('#checkAll').prop("checked");  
+		if(ischecked)
+			return true;
+		else
+			return false;
+	}

infosouth-admin/src/main/resources/static/oneself/customer_js/analysis/myModelChartApi.js

@@ -0,0 +1,427 @@
+var myChartApi_locat = (window.location+'').split('/'); 
+var myChartApi_locate_url = '';
+$(function(){
+	myChartApi_locat =  myChartApi_locat[0]+'//'+myChartApi_locat[2]+'/'+myChartApi_locat[3];
+	myChartApi_locate_url = myChartApi_locat + '/a';
+});
+
+
+//Echarts绘图
+function echart_mychart(xaxis_data,yaxis_mySeries,clicked_columnNamesArr,main_chart_div_k){
+	// 基于准备好的dom，初始化echarts实例
+    //var myChart = echarts.init(document.getElementById('main_chart'));
+	var myChart = echarts.init($('#'+main_chart_div_k)[0]);
+	
+    // 指定图表的配置项和数据
+    var option = {
+        title: {
+            text: ''
+        },
+        tooltip: {
+        	trigger: 'axis',
+	        axisPointer: {
+	            type: 'cross',
+	            animation: false,
+	            label: {
+	                backgroundColor: '#0D4286'
+	            }
+	        }
+        },
+        dataZoom: [
+          {
+	        show: true,
+	        realtime: true,
+	        start: 0,
+	        end: 100,
+	        // backgroundColor:'#d'
+	        textStyle: {
+	            color: "#ffffff"
+	        }
+          },
+	       {
+		        type: 'inside',
+		        realtime: true,
+		        start: 5,
+		        end: 85
+		    }
+	    ],
+	    grid: {
+	        top: '10%',
+	        left: '2%',
+	        right: '1%',
+	        bottom: '14%',
+	        containLabel: true
+	    },
+        legend: {
+        	show:false,
+            data:clicked_columnNamesArr
+        },
+        xAxis: {
+            data: xaxis_data
+        },
+        yAxis: {},              
+	    series: yaxis_mySeries
+    };
+    
+    // 使用刚指定的配置项和数据显示图表。
+    myChart.setOption(option);
+    //自适应屏幕
+    window.onresize = function(){
+    	myChart.resize();
+    }
+
+    //将图形对象存进数组，myLineChartArr 是全局变量
+    myLineChartArr.push(myChart);
+  
+}
+
+//绘图，result_paramsArr_data = data.data
+function req_refresh_chart(result_paramsArr_data){
+	var paramAllData = [];	
+	
+	//将模型返回的数据临时存储
+	models_result_paramsArr_data = [];
+	models_result_paramsArr_data = result_paramsArr_data;
+	var result_paramsArr_dataLen = result_paramsArr_data.length;
+	
+	//每个图表容器的高度
+	chart_containerHeight = parseInt(page_total_height/result_paramsArr_dataLen);
+	
+	//注销之前的图形缓存，1个以上的图表	
+	disposeHistoryChatObjArr();
+
+	//清空
+	myLineChartArr = [];
+	console.log('注销之前的图形缓存成功');
+	
+	//
+	for(var k=0;k<result_paramsArr_data.length;k++){ //所有选中的参数
+		//画图中的series参数
+		var mySeries = [];
+		//某个参数包含的数据
+		var chartDataSets = [];
+		var result_params_data = result_paramsArr_data[k];
+		var req_param_data = result_params_data.req_param_data;
+		//参数名
+		var paramName_k = req_param_data.paramName;	
+		paramName_kArr = [];
+		paramName_kArr.push(paramName_k);
+		//参数包含的数据
+		paramAllData = req_param_data.paramAllData;
+				
+		//选择的的参数的字体颜色
+		var param_fontColor = "rgba("+redcolor+","+greencolor+","+bluecolor+",1)";
+		$("."+req_param_data.paramName+"_class").css({"color":param_fontColor});
+		//图形对象div
+		main_chart_div_k = '';
+		if(result_paramsArr_dataLen==1) //只有一个参数
+			main_chart_div_k = addOneChart(0,'onlyone',chart_containerHeight,paramName_k,param_fontColor);
+		else  //多个参数
+			main_chart_div_k = addOneChart(k,'',chart_containerHeight,paramName_k,param_fontColor);
+		
+		//每一个csv中计算出来的x轴数据
+		var paramValue_jArr_X = [];
+		//获取x轴数据时需要判断该值
+		loop_paramAllData_temp_i = -1;
+		
+		//遍历该参数中的所有曲线		
+		for(var i=0;i<paramAllData.length;i++){
+			
+			var paramObj = paramAllData[i];
+			var paramName = paramObj.paramName;
+			//一个csv的计算后的数据
+			var paramValue = paramObj.paramValue;						
+			//文件名序号
+			fileIndex = paramObj.fileIndex;
+			//文件名
+			var paramMappingFileName = paramObj.fileName;
+			
+			
+			
+			//每一个csv中计算出来的y轴数据
+			var paramValue_jArr_Y = [];			
+			var paramValueArr = paramValue.split(';');
+
+
+			//是否有勾选全选checkbox,没有勾选
+			if(!isChoosed_CheckAll_CheckBox()){
+				//只绘一条线，不管有没有值
+				if(i==0){
+					//有值的参数
+					paramValue_jArr_Y = paramValueArr;
+					//
+					mySeries_data_i = {"name":'csv'+parseInt(fileIndex),"type":"line","data":paramValue_jArr_Y,"yAxisIndex":0};
+					//图表数据集
+					mySeries.push(mySeries_data_i);		
+					paramValue_jArr_Y = [];
+					
+					//取消勾选所有csv文件的checkbox
+					$('[name=checkbox_name_file]:checkbox').each(function(){
+		        		$(this).attr("checked",this.checked==true?false:false);
+		        	});
+					//获取选中的第一个有值的csv文件的checkbox value
+					getFirstChoosedFileCheckbox(paramMappingFileName);
+					console.log('获取某个图表数据集成功1');
+					//
+				}
+			}
+			
+			
+			//获取每个参数x轴数据------------------------------------------
+			if(paramValue==''||paramValue==""||paramValue==null){
+				continue;
+			}else{
+				if(loop_paramAllData_temp_i==-1){
+					loop_paramAllData_temp_i = i;
+					if(loop_paramAllData_temp_i>-1){
+						//有值的参数
+						for(var ii=0;ii<paramValueArr.length;ii++){
+							//只计算一个csv的x轴数据
+							paramValue_jArr_X.push(ii);
+						}						
+					}
+				}								
+			}							
+			//获取每个参数x轴数据------------------------------------------											
+			paramValue_jArr_Y = paramValueArr;
+
+			//是否有勾选全选checkbox,有勾选
+			if(isChoosed_CheckAll_CheckBox()){
+				//
+				mySeries_data_i = {"name":'csv'+parseInt(fileIndex),"type":"line","data":paramValue_jArr_Y,"yAxisIndex":0};
+				//图表数据集
+				mySeries.push(mySeries_data_i);						
+				//获取选中的第一个有值的csv文件的checkbox value
+				getFirstChoosedFileCheckbox(paramMappingFileName);
+				console.log('获取某个图表数据集成功2');
+			}
+			
+		}
+		
+		//Echarts 绘图
+		echart_mychart(paramValue_jArr_X,mySeries,paramName_kArr,main_chart_div_k);	
+
+	}
+}
+
+
+//新增chart图表
+function addOneChart(i,onlyoneFlag,chart_containerHeight,showParamName,param_fontColor){
+		
+	var charthtml = '';
+		//$(".chart_container").css({"height":""+chart_containerHeight+"px","margin-top":"10px"});  		
+  	var $width=$(".chart_container").width();			
+	var $height=$(".chart_container").height(); 
+	//图形对象div
+	main_chart_div_k = '';	
+	if(i==0){
+		$(".span7").empty();
+		//显示参数名
+		showParamNameHtml = "<div class=\"showParamName_div"+i+"\"><span class=\"showParamName_style"+i+"\">参数名："+showParamName+"</span></div";
+  		$(".span7").append(showParamNameHtml);
+  		$(".showParamName_div"+i).css({"text-align":"center"});
+		$(".showParamName_style"+i).css({"color":param_fontColor,"text-align":"center"});
+		
+  		var first_charthtml = '';
+  		first_charthtml += "<div class=\"chart_container\">";	
+  		if(onlyoneFlag=='onlyone')
+  			first_charthtml += "<div id=\"main_chart\" style=\"height:400px;\"></div>";
+  		else
+  			first_charthtml += "<div id=\"main_chart\" style=\"height:400px;\"></div>";
+  		first_charthtml += "</div>";
+  		$(".span7").append(first_charthtml);
+  		//改成不设高度
+  		//$(".chart_container").css({"margin-top":"2px"});
+  		//如果只有一个图表，设置高度为780
+  		if(onlyoneFlag=='onlyone')
+  			$(".chart_container").css({"height":""+page_total_height});
+  		
+		//
+  		$("#main_chart").width=$width;
+		$("#main_chart").height=$height;
+		
+		main_chart_div_k = 'main_chart';
+		return main_chart_div_k;
+  	} 	  		
+	if(i>0){	
+		//显示参数名
+		showParamNameHtml = "<div class=\"showParamName_div"+i+"\"><span class=\"showParamName_style"+i+"\">参数名："+showParamName+"</span></div";
+  		$(".span7").append(showParamNameHtml);
+  		$(".showParamName_div"+i).css({"text-align":"center","margin-top":"20px"});
+		$(".showParamName_style"+i).css({"color":param_fontColor,"text-align":"center"});
+		
+		charthtml += "<div class=\"chart_container\">";			
+	  	charthtml += "<div id=\"main_chart"+i+"\" style=\"height:400px;\"></div>";
+	  	charthtml += "</div>";
+	  	$(".span7").append(charthtml);
+	 	 //改成不设高度
+  		//$(".chart_container").css({"margin-top":"2px"});	  		
+		//
+	  	$("#main_chart"+i).width=$width;
+		$("#main_chart"+i).height=$height;
+		main_chart_div_k = 'main_chart'+i;
+		return main_chart_div_k;
+	}			
+}
+
+
+	
+//
+function req_refresh_chart_by_condition(result_paramsArr_data,filesNameStr){
+	var paramAllData = [];	
+	if(filesNameStr!='allFiles'){//如果不是选择的所有文件
+		//解析filesNameArr，获取新的result_paramsArr_data---------------------
+		result_paramsArr_data = getNewresult_paramsArr_data(result_paramsArr_data,filesNameStr);
+		//解析filesNameArr，获取新的result_paramsArr_data---------------------
+	}
+	
+	var result_paramsArr_dataLen = result_paramsArr_data.length;
+	
+	//注销之前的图形缓存，1个以上的图表	
+	disposeHistoryChatObjArr();
+	
+	//每个图表容器的高度
+	chart_containerHeight = parseInt(page_total_height/result_paramsArr_dataLen);
+	//
+	for(var k=0;k<result_paramsArr_data.length;k++){ //所有选中的参数
+		//画图中的series参数
+		var mySeries = [];
+
+		//某个参数包含的数据
+		var chartDataSets = [];
+		var result_params_data = result_paramsArr_data[k];
+		var req_param_data = result_params_data.req_param_data;
+		//参数名
+		var paramName_k = req_param_data.paramName;	
+		paramName_kArr = [];
+		paramName_kArr.push(paramName_k);
+		//参数包含的数据
+		paramAllData = req_param_data.paramAllData;
+				
+		//选择的的参数的字体颜色
+		var param_fontColor = "rgba("+redcolor+","+greencolor+","+bluecolor+",1)";
+		$("."+req_param_data.paramName+"_class").css({"color":param_fontColor});
+		//图形对象div
+		main_chart_div_k = '';
+		if(result_paramsArr_dataLen==1) //只有一个参数
+			main_chart_div_k = addOneChart(0,'onlyone',chart_containerHeight,paramName_k,param_fontColor);
+		else  //多个参数
+			main_chart_div_k = addOneChart(k,'',chart_containerHeight,paramName_k,param_fontColor);
+		
+		//每一个csv中计算出来的x轴数据
+		var paramValue_jArr_X = [];
+		//获取x轴数据时需要判断该值
+		loop_paramAllData_temp_i = -1;
+		
+		//遍历该参数中的所有曲线		
+		for(var i=0;i<paramAllData.length;i++){
+			var paramObj = paramAllData[i];
+			var paramName = paramObj.paramName;
+			//一个csv的计算后的数据
+			var paramValue = paramObj.paramValue;						
+			//文件名序号
+			fileIndex = paramObj.fileIndex;
+			
+			//每一个csv中计算出来的y轴数据
+			var paramValue_jArr_Y = [];			
+			var paramValueArr = paramValue.split(';');
+			
+			//获取每个参数x轴数据------------------------------------------
+			
+			if(paramValue==''||paramValue==""||paramValue==null){
+				//oDateAlert('该文件无结果数据');
+				continue;
+			}else{
+				if(loop_paramAllData_temp_i==-1){
+					loop_paramAllData_temp_i = i;
+					if(loop_paramAllData_temp_i>-1){
+						for(var ii=0;ii<paramValueArr.length;ii++){
+							//只计算一个csv的x轴数据
+							paramValue_jArr_X.push(ii);
+						}
+					}
+				}								
+			}							
+			//获取每个参数x轴数据------------------------------------------											
+			paramValue_jArr_Y = paramValueArr;
+
+			//
+			mySeries_data_i = {"name":'csv'+parseInt(fileIndex),"type":"line","data":paramValue_jArr_Y,"yAxisIndex":0};
+			//图表数据集
+			mySeries.push(mySeries_data_i);
+			console.log('获取某个图表数据集成功');
+		}
+		
+		//Echarts 绘图
+		echart_mychart(paramValue_jArr_X,mySeries,paramName_kArr,main_chart_div_k);	
+
+	}
+}
+
+//根据勾选的csv文件，从所有csv文件中选出勾选的文件数据
+function getNewresult_paramsArr_data(result_paramsArr_data,filesNameStr,allClickFlag){
+	var result_paramsArr_dataNew = [];
+	var filesNameArr = filesNameStr.split(",");
+	var result_paramsArr_dataLen = result_paramsArr_data.length;
+	for(var k=0;k<result_paramsArr_dataLen;k++){
+		var result_params_data = result_paramsArr_data[k];
+		var req_param_data = result_params_data.req_param_data;
+		var paramAllData = req_param_data.paramAllData;	
+		var result_params_dataNew;
+		var req_param_dataNew;
+		var paramAllDataNew=[];
+		for(var i=0;i<filesNameArr.length;i++){
+			for(var j=0;j<paramAllData.length;j++){
+				var paramObj = paramAllData[j];
+				var paramName = paramObj.paramName;
+				//一个csv的计算后的数据
+				var fileName = paramObj.fileName;
+				if(filesNameArr[i]==fileName){
+					paramAllDataNew.push(paramObj);
+				}
+			}
+		}			
+		req_param_dataNew = {"paramAllData":paramAllDataNew,"keyPointName":req_param_data.keyPointName,"paramName":req_param_data.paramName,"param_X_Length":req_param_data.param_X_Length,"param_from":req_param_data.param_from,"param_to":req_param_data.param_to};
+		result_params_dataNew = {"req_param_data":req_param_dataNew}
+		result_paramsArr_dataNew.push(result_params_dataNew);
+	}
+	
+	return result_paramsArr_dataNew;	
+}
+
+
+//获取选中的第一个csv文件的checkbox value
+function getFirstChoosedFileCheckbox(paramMappingFileName){
+	$('[name=checkbox_name_file]:checkbox').each(function(index,obj){
+		choosed_file_checkbox_value = '';
+		choosed_file_checkbox_value = $(this).attr('value');
+		choosed_file_checkbox_valueArrTemp = [];
+		choosed_file_checkbox_valueArrTemp = choosed_file_checkbox_value.split(";");
+		choosed_fileName = '';
+		if(choosed_file_checkbox_valueArrTemp!=''&&choosed_file_checkbox_valueArrTemp.length>2){
+			choosed_fileName = choosed_file_checkbox_valueArrTemp[2];
+		}
+		if(choosed_fileName == paramMappingFileName){
+			$(this).attr("checked",this.checked==true?true:true);
+		}
+	});
+}
+
+
+
+//注销之前的图形缓存，1个以上的图表	
+function disposeHistoryChatObjArr(){
+	//注销之前的图形缓存，1个以上的图表	
+	for(var charti=0;charti<myLineChartArr.length;charti++){
+		myLineChartArr[charti].dispose();		
+	}
+}
+
+//是否有勾选全选checkbox
+function isChoosed_CheckAll_CheckBox(){
+	var ischecked = $('#checkAll').prop("checked");  
+	if(ischecked)
+		return true;
+	else
+		return false;
+}

infosouth-admin/src/main/resources/static/oneself/customer_js/analysis/myModelChartApi2.js

@@ -0,0 +1,539 @@
+var myChartApi_locat = (window.location+'').split('/'); 
+var myChartApi_locate_url = '';
+$(function(){
+	myChartApi_locat =  myChartApi_locat[0]+'//'+myChartApi_locat[2]+'/'+myChartApi_locat[3];
+	myChartApi_locate_url = myChartApi_locat + '/a';
+});
+
+
+//Echarts绘图
+function echart_mychart(xaxis_data,yaxis_mySeries,clicked_columnNamesArr,main_chart_div_k){
+	// 基于准备好的dom，初始化echarts实例
+    //var myChart = echarts.init(document.getElementById('main_chart'));
+	var myChart = echarts.init($(parent.window.frames["modelResultShowDetail"].document).find('#'+main_chart_div_k)[0]);	
+	//全局颜色，默认
+	var whole_chartLine_colorArrDefault = ['#3784D4','#0DCB5F','#9AD873','#5DBBE1','#75D3DF','#F36059','#FA9253','#F4D371','#D1EA85','#546570','#c4ccd3'];	
+	
+    // 指定图表的配置项和数据
+    var option = {
+        title: {
+            text: ''
+        },
+        color:whole_chartLine_colorArrDefault,
+        tooltip: {
+        	trigger: 'axis',
+	        axisPointer: {
+	            type: 'cross',
+	            animation: false,
+	            label: {
+	                backgroundColor: '#0D4286'
+	            }
+	        }
+        },
+        dataZoom: [
+            {
+				//这个dataZoom组件，默认控制x轴。slider 表示滑动条型
+				type: 'slider', // 这个 dataZoom 组件是 slider 型 dataZoom 组件
+				xAxisIndex: 0,
+				start: 0,
+				end: 100,
+				// backgroundColor:'#d'
+				textStyle: {
+				    color: "#ffffff"
+				}
+			},
+			{
+			  //在坐标系内进行拖动，以及用滚轮（或移动触屏上的两指滑动）进行缩放  
+			  type: 'inside',
+			  xAxisIndex: 0,
+			  start: 0,
+			  end: 5
+			},
+			{
+			   type: 'slider',
+			   yAxisIndex: 0,
+			   start: 0,
+			   end: 100
+			},
+			{
+			   type: 'inside',
+			   yAxisIndex: 0,
+			   start: 0,
+			   end: 100
+			}
+	    ],
+	    grid: {
+	        top: '10%',
+	        left: '2%',
+	        right: '1%',
+	        bottom: '14%',
+	        containLabel: true
+	    },
+        legend: {
+        	show:false,
+            data:clicked_columnNamesArr
+        },
+        xAxis: {
+            data: xaxis_data
+        },
+        yAxis: {},              
+	    series: yaxis_mySeries
+    };
+    
+    // 使用刚指定的配置项和数据显示图表。
+    myChart.setOption(option);
+    //自适应屏幕
+    window.onresize = function(){
+    	myChart.resize();
+    }
+
+    //将图形对象存进数组，myLineChartArr 是全局变量
+    myLineChartArr.push(myChart);
+}
+
+//绘图，result_paramsArr_data = data.data
+function req_refresh_chart(result_paramsArr_data){
+	var paramAllData = [];	
+	
+	//将模型返回的数据临时存储
+	//models_result_paramsArr_data = [];
+	//models_result_paramsArr_data = result_paramsArr_data;
+	var result_paramsArr_dataLen = result_paramsArr_data.length;
+	
+	//每个图表容器的高度
+	chart_containerHeight = parseInt(page_total_height/result_paramsArr_dataLen);
+	
+	//注销之前的图形缓存，1个以上的图表	
+	disposeHistoryChatObjArr();
+
+	//清空
+	myLineChartArr = [];
+	console.log('注销之前的图形缓存成功');
+	//获取上次勾选的csv文件名
+	var choosedfilesNameStrArr = getLastChoosedCsvFileName();
+	//取消勾选所有csv文件的checkbox
+	//设置所有的csv文件checkbox取消勾选
+	setAllFileCheckboxClickedFalse();
+	//获取上次手动勾选的csv文件名，并勾选
+	setChoosedFileCheckboxClickedTrue(choosedfilesNameStrArr);
+	//如果全选有勾选，设置所有的csv文件checkbox设为勾选
+	if(isChoosed_CheckAll_CheckBox()){
+		setAllFileCheckboxClickedTrue();
+	}	
+	//
+	for(var k=0;k<result_paramsArr_data.length;k++){ //所有选中的参数
+		//画图中的series参数
+		var mySeries = [];
+
+		//某个参数包含的数据
+		var chartDataSets = [];
+		var result_params_data = result_paramsArr_data[k];
+		var req_param_data = result_params_data.req_param_data;
+		//参数名
+		var paramName_k = req_param_data.paramName;	
+		paramName_kArr = [];
+		paramName_kArr.push(paramName_k);
+		//参数包含的数据
+		paramAllData = req_param_data.paramAllData;
+				
+		//选择的的参数的字体颜色
+		var param_fontColor = "rgba("+redcolor+","+greencolor+","+bluecolor+",1)";
+		$("."+req_param_data.paramName+"_class").css({"color":param_fontColor});
+		$(parent.window.frames["modelResultShowDetail"].document).find("."+req_param_data.paramName+"_class").css({"color":param_fontColor});
+		//图形对象div
+		main_chart_div_k = '';
+		if(result_paramsArr_dataLen==1) //只有一个参数
+			main_chart_div_k = addOneChart(0,'onlyone',chart_containerHeight,paramName_k,param_fontColor);
+		else  //多个参数
+			main_chart_div_k = addOneChart(k,'',chart_containerHeight,paramName_k,param_fontColor);
+		
+		//每一个csv中计算出来的x轴数据
+		var paramValue_jArr_X = [];
+		//获取x轴数据时需要判断该值
+		loop_paramAllData_temp_i = -1;
+		
+		
+		//遍历该参数中的所有曲线		
+		for(var i=0;i<paramAllData.length;i++){
+			
+			var paramObj = paramAllData[i];
+			var paramName = paramObj.paramName;
+			//一个csv的计算后的数据
+			var paramValue = paramObj.paramValue;						
+			//文件名序号
+			fileIndex = paramObj.fileIndex;
+			//文件名
+			var paramMappingFileName = paramObj.fileName;
+			
+			
+			
+			//每一个csv中计算出来的y轴数据
+			var paramValue_jArr_Y = [];			
+			var paramValueArr = paramValue.split(';');
+
+			//是否有勾选全选checkbox,没有勾选
+			if(isChoosed_CheckAll_CheckBox()==false){
+				if(i==0){
+					//有值的参数
+					paramValue_jArr_Y = paramValueArr;
+					//
+					mySeries_data_i = {"name":'csv'+parseInt(fileIndex),"type":"line","data":paramValue_jArr_Y,"yAxisIndex":0,"lineStyle":{"width":1}};
+					//图表数据集
+					mySeries.push(mySeries_data_i);		
+					paramValue_jArr_Y = [];
+					
+					//获取选中的第一个csv文件的checkbox value，并勾选,即使没有勾选，只要是第一个csv文件
+					if(choosedfilesNameStrArr.length==0||choosedfilesNameStrArr=='undefined'||choosedfilesNameStrArr==undefined){
+						getFirstChoosedFileCheckbox(paramMappingFileName);
+					}
+					console.log('获取某个图表数据集成功1');
+					//
+				}
+				
+				var isMatch_choosedFileName_flag = false;
+				for(var csvi=0;csvi<choosedfilesNameStrArr.length;csvi++){
+					if(paramMappingFileName==choosedfilesNameStrArr[csvi]){
+						isMatch_choosedFileName_flag = true;
+					}
+				}
+				//只绘一条线，不管有没有值（原来）
+				//现在改成之前手动勾选几个csv，重新绘图的时候，还是默认这几个csv数据绘图
+				if(isMatch_choosedFileName_flag){					
+					if(i>0){
+						//i==0之前已经获取过了，所以略过
+						
+						//有值的参数
+						paramValue_jArr_Y = paramValueArr;
+						//
+						mySeries_data_i = {"name":'csv'+parseInt(fileIndex),"type":"line","data":paramValue_jArr_Y,"yAxisIndex":0,"lineStyle":{"width":1}};
+						//图表数据集
+						mySeries.push(mySeries_data_i);		
+						paramValue_jArr_Y = [];
+
+						console.log('获取某个图表数据集成功1');
+						//
+					}
+				}
+				
+			}
+			
+			
+			//获取每个参数x轴数据------------------------------------------
+			if(paramValue==''||paramValue==""||paramValue==null){
+				continue;
+			}else{
+				if(loop_paramAllData_temp_i==-1){
+					loop_paramAllData_temp_i = i;
+					if(loop_paramAllData_temp_i>-1){
+						//有值的参数
+						for(var ii=0;ii<paramValueArr.length;ii++){
+							//只计算一个csv的x轴数据
+							paramValue_jArr_X.push(ii);
+						}						
+					}
+				}								
+			}							
+			//获取每个参数x轴数据------------------------------------------											
+			paramValue_jArr_Y = paramValueArr;
+
+			//是否有勾选全选checkbox,有勾选
+			if(isChoosed_CheckAll_CheckBox()){
+				//
+				mySeries_data_i = {"name":'csv'+parseInt(fileIndex),"type":"line","data":paramValue_jArr_Y,"yAxisIndex":0,"lineStyle":{"width":1}};
+				//图表数据集
+				mySeries.push(mySeries_data_i);	
+				console.log('获取某个图表数据集成功2');
+			}
+			
+		}
+		
+		//Echarts 绘图
+		echart_mychart(paramValue_jArr_X,mySeries,paramName_kArr,main_chart_div_k);	
+	}
+}
+
+
+//新增chart图表
+function addOneChart(i,onlyoneFlag,chart_containerHeight,showParamName,param_fontColor){
+		
+	var charthtml = '';
+		//$(".chart_container").css({"height":""+chart_containerHeight+"px","margin-top":"10px"});  		
+  	var $width=$(parent.window.frames["modelResultShowDetail"].document).find(".chart_container").width();			
+	var $height=$(parent.window.frames["modelResultShowDetail"].document).find(".chart_container").height(); 
+	//图形对象div
+	main_chart_div_k = '';	
+	if(i==0){
+		$(parent.window.frames["modelResultShowDetail"].document).find(".span12").empty();
+		//显示参数名
+		showParamNameHtml = "<div class=\"showParamName_div"+i+"\"><span class=\"showParamName_style"+i+"\">参数名："+showParamName+"</span></div";
+		$(parent.window.frames["modelResultShowDetail"].document).find(".span12").append(showParamNameHtml);
+		$(parent.window.frames["modelResultShowDetail"].document).find(".showParamName_div"+i).css({"text-align":"center"});
+		$(parent.window.frames["modelResultShowDetail"].document).find(".showParamName_style"+i).css({"color":param_fontColor,"text-align":"center"});
+		
+  		var first_charthtml = '';
+  		first_charthtml += "<div class=\"chart_container\">";	
+  		if(onlyoneFlag=='onlyone')
+  			first_charthtml += "<div id=\"main_chart\" style=\"height:400px;\"></div>";
+  		else
+  			first_charthtml += "<div id=\"main_chart\" style=\"height:400px;\"></div>";
+  		first_charthtml += "</div>";
+  		$(parent.window.frames["modelResultShowDetail"].document).find(".span12").append(first_charthtml);
+  		//改成不设高度
+  		//$(".chart_container").css({"margin-top":"2px"});
+  		//如果只有一个图表，设置高度为780
+  		if(onlyoneFlag=='onlyone')
+  			$(parent.window.frames["modelResultShowDetail"].document).find(".chart_container").css({"height":""+page_total_height});
+  		
+		//
+  		$(parent.window.frames["modelResultShowDetail"].document).find("#main_chart").width=$width;
+  		$(parent.window.frames["modelResultShowDetail"].document).find("#main_chart").height=$height;
+		
+		main_chart_div_k = 'main_chart';
+		return main_chart_div_k;
+  	} 	  		
+	if(i>0){	
+		//显示参数名
+		showParamNameHtml = "<div class=\"showParamName_div"+i+"\"><span class=\"showParamName_style"+i+"\">参数名："+showParamName+"</span></div";
+		$(parent.window.frames["modelResultShowDetail"].document).find(".span12").append(showParamNameHtml);
+		$(parent.window.frames["modelResultShowDetail"].document).find(".showParamName_div"+i).css({"text-align":"center","margin-top":"20px"});
+		$(parent.window.frames["modelResultShowDetail"].document).find(".showParamName_style"+i).css({"color":param_fontColor,"text-align":"center"});
+		
+		charthtml += "<div class=\"chart_container\">";			
+	  	charthtml += "<div id=\"main_chart"+i+"\" style=\"height:400px;\"></div>";
+	  	charthtml += "</div>";
+	  	$(parent.window.frames["modelResultShowDetail"].document).find(".span12").append(charthtml);
+	 	 //改成不设高度
+  		//$(".chart_container").css({"margin-top":"2px"});	  		
+		//
+	  	$(parent.window.frames["modelResultShowDetail"].document).find("#main_chart"+i).width=$width;
+	  	$(parent.window.frames["modelResultShowDetail"].document).find("#main_chart"+i).height=$height;
+		main_chart_div_k = 'main_chart'+i;
+		return main_chart_div_k;
+	}			
+}
+
+
+	
+//
+function req_refresh_chart_by_condition(result_paramsArr_data,filesNameStr){
+	var paramAllData = [];	
+	
+	var result_paramsArr_dataLen = result_paramsArr_data.length;
+	
+	//注销之前的图形缓存，1个以上的图表	
+	disposeHistoryChatObjArr();
+	
+	//每个图表容器的高度
+	chart_containerHeight = parseInt(page_total_height/result_paramsArr_dataLen);
+	//
+	for(var k=0;k<result_paramsArr_data.length;k++){ //所有选中的参数
+		//画图中的series参数
+		var mySeries = [];
+
+		//某个参数包含的数据
+		var chartDataSets = [];
+		var result_params_data = result_paramsArr_data[k];
+		var req_param_data = result_params_data.req_param_data;
+		//参数名
+		var paramName_k = req_param_data.paramName;	
+		paramName_kArr = [];
+		paramName_kArr.push(paramName_k);
+		//参数包含的数据
+		paramAllData = req_param_data.paramAllData;
+				
+		//选择的的参数的字体颜色
+		var param_fontColor = "rgba("+redcolor+","+greencolor+","+bluecolor+",1)";
+		$("."+req_param_data.paramName+"_class").css({"color":param_fontColor});
+		$(parent.window.frames["modelResultShowDetail"].document).find("."+req_param_data.paramName+"_class").css({"color":param_fontColor});
+		//图形对象div
+		main_chart_div_k = '';
+		if(result_paramsArr_dataLen==1) //只有一个参数
+			main_chart_div_k = addOneChart(0,'onlyone',chart_containerHeight,paramName_k,param_fontColor);
+		else  //多个参数
+			main_chart_div_k = addOneChart(k,'',chart_containerHeight,paramName_k,param_fontColor);
+		
+		//每一个csv中计算出来的x轴数据
+		var paramValue_jArr_X = [];
+		//获取x轴数据时需要判断该值
+		loop_paramAllData_temp_i = -1;
+		
+		//遍历该参数中的所有曲线		
+		for(var i=0;i<paramAllData.length;i++){
+			var paramObj = paramAllData[i];
+			var paramName = paramObj.paramName;
+			//一个csv的计算后的数据
+			var paramValue = paramObj.paramValue;						
+			//文件名序号
+			fileIndex = paramObj.fileIndex;
+			
+			//每一个csv中计算出来的y轴数据
+			var paramValue_jArr_Y = [];			
+			var paramValueArr = paramValue.split(';');
+			
+			//获取每个参数x轴数据------------------------------------------
+			
+			if(paramValue==''||paramValue==""||paramValue==null){
+				//oDateAlert('该文件无结果数据');
+				continue;
+			}else{
+				if(loop_paramAllData_temp_i==-1){
+					loop_paramAllData_temp_i = i;
+					if(loop_paramAllData_temp_i>-1){
+						for(var ii=0;ii<paramValueArr.length;ii++){
+							//只计算一个csv的x轴数据
+							paramValue_jArr_X.push(ii);
+						}
+					}
+				}								
+			}							
+			//获取每个参数x轴数据------------------------------------------											
+			paramValue_jArr_Y = paramValueArr;
+
+			//
+			mySeries_data_i = {"name":'csv'+parseInt(fileIndex),"type":"line","data":paramValue_jArr_Y,"yAxisIndex":0,"lineStyle":{"width":1}};
+			//图表数据集
+			mySeries.push(mySeries_data_i);
+			console.log('获取某个图表数据集成功');
+		}
+		
+		//Echarts 绘图
+		echart_mychart(paramValue_jArr_X,mySeries,paramName_kArr,main_chart_div_k);
+
+	}
+}
+
+//根据勾选的csv文件，从所有csv文件中选出勾选的文件数据
+function getNewresult_paramsArr_data(result_paramsArr_data,filesNameStr,allClickFlag){
+	var result_paramsArr_dataNew = [];
+	var filesNameArr = filesNameStr.split(",");
+	var result_paramsArr_dataLen = result_paramsArr_data.length;
+	for(var k=0;k<result_paramsArr_dataLen;k++){
+		var result_params_data = result_paramsArr_data[k];
+		var req_param_data = result_params_data.req_param_data;
+		var paramAllData = req_param_data.paramAllData;	
+		var result_params_dataNew;
+		var req_param_dataNew;
+		var paramAllDataNew=[];
+		for(var i=0;i<filesNameArr.length;i++){
+			for(var j=0;j<paramAllData.length;j++){
+				var paramObj = paramAllData[j];
+				var paramName = paramObj.paramName;
+				//一个csv的计算后的数据
+				var fileName = paramObj.fileName;
+				if(filesNameArr[i]==fileName){
+					paramAllDataNew.push(paramObj);
+				}
+			}
+		}			
+		req_param_dataNew = {"paramAllData":paramAllDataNew,"keyPointName":req_param_data.keyPointName,"paramName":req_param_data.paramName,"param_X_Length":req_param_data.param_X_Length,"param_from":req_param_data.param_from,"param_to":req_param_data.param_to};
+		result_params_dataNew = {"req_param_data":req_param_dataNew}
+		result_paramsArr_dataNew.push(result_params_dataNew);
+	}
+	
+	return result_paramsArr_dataNew;	
+}
+
+
+//获取选中的第一个csv文件的checkbox value，并勾选
+function getFirstChoosedFileCheckbox(paramMappingFileName){
+	$(parent.window.frames["modelResultShowList"].document).find('[name=checkbox_name_file]:checkbox').each(function(index,obj){
+		choosed_file_checkbox_value = '';
+		choosed_file_checkbox_value = $(this).attr('value');
+		choosed_file_checkbox_valueArrTemp = [];
+		choosed_file_checkbox_valueArrTemp = choosed_file_checkbox_value.split(";");
+		choosed_fileName = '';
+		if(choosed_file_checkbox_valueArrTemp!=''&&choosed_file_checkbox_valueArrTemp.length>2){
+			choosed_fileName = choosed_file_checkbox_valueArrTemp[2];
+		}
+		if(choosed_fileName == paramMappingFileName){
+			$(this).attr("checked",this.checked==true?true:true);
+		}
+	});
+}
+
+//获取上次手动勾选的csv文件名
+function getLastChoosedCsvFileName(){
+	
+	clicked_files_checkboxValue = '';
+	$(parent.window.frames["modelResultShowList"].document).find("#contentTable3 tr").find("td:first input:checkbox").each(function () {  
+	    var ischecked = $(this).prop("checked");  
+	    if(ischecked){
+	    	var checkboxValue = $(this).attr('value');
+	    	clicked_files_checkboxValue += checkboxValue+',';
+	    }
+	    
+		 });
+	
+	var trclassArr = clicked_files_checkboxValue.substring(0,clicked_files_checkboxValue.length-1).split(",");
+	var keyPointName = '';
+	filesNameStr = '';
+	for(var i=0;i<trclassArr.length;i++){
+		var lineId = trclassArr[i];
+		//除去 selected 标签
+		var fidStr = lineId.split(';');
+		//获取关键点名
+		keyPointName = fidStr[0];
+		var linei = fidStr[1];
+		filesNameStr+=fidStr[2]+',';
+
+	}
+	//包含选择过的参数
+	filesNameStr = filesNameStr.substring(0,filesNameStr.length-1);
+	var filesNameStrArr = filesNameStr.split(",");
+	return filesNameStrArr;
+}
+
+//获取上次手动勾选的csv文件名，并勾选
+function setChoosedFileCheckboxClickedTrue(filesNameStrArr){
+	if(filesNameStrArr!=''&&filesNameStrArr!=undefined&&filesNameStrArr!='undefined'){
+		for(var csvi=0;csvi<filesNameStrArr.length;csvi++){
+			var paramMappingFileName = filesNameStrArr[csvi];
+			$(parent.window.frames["modelResultShowList"].document).find('[name=checkbox_name_file]:checkbox').each(function(index,obj){
+				choosed_file_checkbox_value = '';
+				choosed_file_checkbox_value = $(this).attr('value');
+				choosed_file_checkbox_valueArrTemp = [];
+				choosed_file_checkbox_valueArrTemp = choosed_file_checkbox_value.split(";");
+				choosed_fileName = '';
+				if(choosed_file_checkbox_valueArrTemp!=''&&choosed_file_checkbox_valueArrTemp.length>2){
+					choosed_fileName = choosed_file_checkbox_valueArrTemp[2];
+				}
+				if(choosed_fileName == paramMappingFileName){
+					$(this).attr("checked",this.checked==true?true:true);
+				}
+			});
+		}
+		
+	}
+	
+}
+
+//设置所有的csv文件checkbox设为勾选
+function setAllFileCheckboxClickedTrue(){
+	$(parent.window.frames["modelResultShowList"].document).find('[name=checkbox_name_file]:checkbox').each(function(){
+		$(this).attr("checked",this.checked==true?true:true);
+	});
+}
+
+//设置所有的csv文件checkbox取消勾选
+function setAllFileCheckboxClickedFalse(){
+	$(parent.window.frames["modelResultShowList"].document).find('[name=checkbox_name_file]:checkbox').each(function(){
+		$(this).attr("checked",this.checked==true?false:false);
+	});
+}
+
+//注销之前的图形缓存，1个以上的图表	
+function disposeHistoryChatObjArr(){
+	//注销之前的图形缓存，1个以上的图表	
+	for(var charti=0;charti<myLineChartArr.length;charti++){
+		myLineChartArr[charti].dispose();		
+	}
+}
+
+//是否有勾选全选checkbox
+function isChoosed_CheckAll_CheckBox(){
+	var ischecked = $('#checkAll').prop("checked");  
+	if(ischecked)
+		return true;
+	else
+		return false;
+}

infosouth-admin/src/main/resources/static/oneself/customer_js/customer_tools/my_customer_tips.js

@@ -0,0 +1,33 @@
+$(function(){
+	//
+	var alert_tip_html = '';
+	alert_tip_html = "<div id=\"alert_tip\" style=\"width:70%;position:fixed;left:15%;top:40%;background:rgba(0,0,0,0.6);height:3rem;text-align:center;line-height:3rem;border-radius:0.3rem;color:#fff;font-size:1.2rem;display:none;\">添加成功</div>";
+	//遮罩层
+	var zhezhao_html = '';
+	zhezhao_html = "<div id=\"masking_bg\" style=\"display:none;position: fixed;top: 0;right: 0;bottom: 0;left: 0;z-index: 1040;background-color:black;opacity: 0.1\"></div>";
+	zhezhao_html += "<div id=\"zhezhao_mask\" class=\"zhezhao_mask\" style=\"position: absolute; top: 0px; filter: alpha(opacity=40); background-color: #777;z-index: 1002;left: 0px;opacity:0.5;-moz-opacity:0.5;\"></div>";
+
+	$("body").append(alert_tip_html);
+	$("body").append(zhezhao_html);
+})
+/*模拟alert*/
+    function customer_alertTip(txt){
+    	$('#alert_tip').html(txt);
+     	$('#alert_tip').show();
+    	setTimeout(function(){
+    		$('#alert_tip').fadeOut();
+    	},4000);
+	}
+    
+  //兼容火狐、IE8   
+    //显示遮罩层    
+    function show_zhezhao_mask(){     
+        $("#zhezhao_mask").css("height",$(document).height());     
+        $("#zhezhao_mask").css("width",$(document).width());     
+        $("#zhezhao_mask").show();
+    }  
+	
+    //隐藏遮罩层  
+    function hide_zhezhao_mask(){               
+        $("#zhezhao_mask").hide();     
+    } 

infosouth-admin/src/main/resources/static/oneself/customer_js/defaultIndex/defaultIndex_cruisingAltitude_set.js

@@ -0,0 +1,367 @@
+/**
+ * 巡航高度设置
+ * 
+ */
+
+var cruisingAltitude_locat = (window.location+'').split('/'); 
+var cruisingAltitude_locate_url = '';
+$(function(){
+	cruisingAltitude_locat =  cruisingAltitude_locat[0]+'//'+cruisingAltitude_locat[2]+'/'+cruisingAltitude_locat[3];
+	cruisingAltitude_locate_url = cruisingAltitude_locat + '/a';
+});
+
+var cruisingAltitude_static_acType_C900 = global_acTypeArr[0];
+var cruisingAltitude_static_acType_B737 = global_acTypeArr[1];
+var cruisingAltitude_static_acType_A320 = global_acTypeArr[2];
+var cruisingAltitude_static_acType_B777 = global_acTypeArr[3];
+var cruisingAltitude_static_acType_A330 = global_acTypeArr[4];
+//获取数据库中保存的数据
+var cruisingAltitude_getDataFromDB = null;
+
+
+/* *********************************************************C900巡航高度分析*开始******************************************************************************** */
+//查询巡航高度统计结果,没有查询条件，用于默认加载首页
+function getCruisingAltitudeFieldsStatisticsResultToPie(){
+	$.ajax({
+		type: "POST",
+		url: cruisingAltitude_locate_url+'/defaultIndex/cruisingAltitude/getCruisingAltitudeFields',
+    	data: {},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			if(data.status=='1001'||data.status==1001){
+				infoCruisingaltitudesettingJson = {};
+				infoCruisingaltitudesettingJson = data.data;
+				cruisingAltitude_getDataFromDB = data;
+				
+				resultField1Json = {};
+				resultField1Json = {"field_index":"1","field_min":infoCruisingaltitudesettingJson.field1_min,"field_max":infoCruisingaltitudesettingJson.field1_max,"field_count":infoCruisingaltitudesettingJson.field1_flight_count};
+				resultField2Json = {};
+				resultField2Json = {"field_index":"2","field_min":infoCruisingaltitudesettingJson.field2_min,"field_max":infoCruisingaltitudesettingJson.field2_max,"field_count":infoCruisingaltitudesettingJson.field2_flight_count};
+				resultField3Json = {};
+				resultField3Json = {"field_index":"3","field_min":infoCruisingaltitudesettingJson.field3_min,"field_max":infoCruisingaltitudesettingJson.field3_max,"field_count":infoCruisingaltitudesettingJson.field3_flight_count};
+				resultField4Json = {};
+				resultField4Json = {"field_index":"4","field_min":infoCruisingaltitudesettingJson.field4_min,"field_max":infoCruisingaltitudesettingJson.field4_max,"field_count":infoCruisingaltitudesettingJson.field4_flight_count};
+				
+				resultParamDataJson = [];
+				resultParamDataJson.push(resultField1Json);
+				resultParamDataJson.push(resultField2Json);
+				resultParamDataJson.push(resultField3Json);
+				resultParamDataJson.push(resultField4Json);
+				
+				var $chart_container_width_pie=$(".chart_container_width_pie").width();
+				var $chart_container_height_pie=$(".chart_container_height_pie").height(); 
+				
+				chart_container_width_pie = $chart_container_width_pie;
+				chart_container_height_pie = $chart_container_height_pie;
+				
+				//绘制圆饼图
+				pie_chart(chart_container_width_pie,chart_container_height_pie,resultParamDataJson);
+				
+				//更新标题-飞行参数
+				cruisingAltitude_title_param = '';
+				cruisingAltitude_title_param = infoCruisingaltitudesettingJson.statistics_title;
+				$(".cruisingAltitude_task_title").empty();
+				$(".cruisingAltitude_task_title").append(cruisingAltitude_title_param);
+				
+				//
+				//初始化下拉框----------------------------------------------			
+				var jobId = infoCruisingaltitudesettingJson.jobId;
+				var infoDutyScheduleList_CRJ900JsonArr = [];
+				infoDutyScheduleList_CRJ900JsonArr = data.infoDutyScheduleList_CRJ900JsonArr;
+				cruisingAltitude_set_choosed_select_Init(infoCruisingaltitudesettingJson,infoDutyScheduleList_CRJ900JsonArr);
+
+				//初始化下拉框----------------------------------------------
+			}else{
+				oDateAlert2(data.data);
+				return;
+			}
+			
+		}
+		
+	});
+}
+	
+	
+	
+	//初始化所有选过的下拉框
+	function cruisingAltitude_set_choosed_select_Init(infoCruisingaltitudesettingJson,infoDutyScheduleList_CRJ900JsonArr){
+		chooseOption_jobId = '';
+    	//
+		$.each(infoDutyScheduleList_CRJ900JsonArr,function(index,infoDutyScheduleList_CRJ900JsonArrEach){					
+			if(infoDutyScheduleList_CRJ900JsonArrEach.id==infoCruisingaltitudesettingJson.jobId){
+				$("#cruisingAltitude_jobId_CRJ900").val(infoCruisingaltitudesettingJson.jobId).trigger("change");
+			}
+		});	
+
+		//查询所有模型下拉选项		
+		//cruisingAltitude_getModelsListByJobId_sync(infoCruisingaltitudesettingJson.jobId,infoCruisingaltitudesettingJson.modelname);
+		//将选中过的模型设为默认
+		cruisingAltitude_jobId_CRJ900_chooseOption = '';
+		cruisingAltitude_jobId_CRJ900_chooseOption = $("#cruisingAltitude_jobId_CRJ900").val();
+		var all = "";
+		$("#cruisingAltitude_modelName_C900 option").each(function() {
+		    all += $(this).attr("value")+" ";
+		});
+		//选中的模型名					
+		if(cruisingAltitude_jobId_CRJ900_chooseOption!=''&&cruisingAltitude_jobId_CRJ900_chooseOption!=undefined){
+			$("#cruisingAltitude_modelName_C900").val(infoCruisingaltitudesettingJson.modelname).trigger("change");
+		}
+
+		//查询所有参数下拉选项
+		//cruisingAltitude_getParamsListByModelName_sync(infoCruisingaltitudesettingJson.jobId,infoCruisingaltitudesettingJson.modelname);
+		
+		//
+		cruisingAltitude_modelName_C900_chooseOption = '';
+		cruisingAltitude_modelName_C900_chooseOption = $("#cruisingAltitude_modelName_C900").val();
+		if(cruisingAltitude_modelName_C900_chooseOption!=''&&cruisingAltitude_modelName_C900_chooseOption!=undefined){
+			$("#cruisingAltitude_paramName_C900").val(infoCruisingaltitudesettingJson.paramname).trigger("change");
+		}	
+		
+	}
+
+	
+	
+//巡航高度，通过jobId 获取模型列表
+function cruisingAltitude_getModelsListByJobId(jobId){	
+	$.ajax({
+		type: "POST",
+		url: cruisingAltitude_locate_url+'/defaultIndex/cruisingAltitude/getModelsListByJobId',
+    	data: {jobId:jobId},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			hide_zhezhao_mask();//关闭遮罩层
+			if(data.status==1001||data.status=='1001'){
+				$("#cruisingAltitude_modelName_C900").empty();      //清空	
+				$("#cruisingAltitude_modelName_C900").select2("val", ""); 
+				var returnParams = data.data;
+				if(returnParams!='' && returnParams.length != 0){
+					$("#cruisingAltitude_modelName_C900").append("<option value=\"\"></option>"); 
+	                for(var i=0; i<returnParams.length; i++){  
+	                    var option="<option value=\""+returnParams[i]+"\""; 
+	                    option += ">"+returnParams[i]+"--模型</option>";  //动态添加数据
+	                    $("#cruisingAltitude_modelName_C900").append(option); 
+	                }  
+	        	} 
+				return true;
+			}else{
+				oDateAlert(data.data);
+				return false;
+			}
+			
+		}
+		
+	});
+}
+
+//巡航高度，通过jobId，模型名 获取参数列表
+function cruisingAltitude_getParamsListByModelName(jobId,modelName){	
+	$.ajax({
+		type: "POST",
+		url: cruisingAltitude_locate_url+'/defaultIndex/cruisingAltitude/getParamsListByModelName',
+    	data: {jobId:jobId,modelName:modelName},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			$("#cruisingAltitude_paramName_C900").empty();      //清空	
+			$("#cruisingAltitude_paramName_C900").select2("val", ""); 
+			var returnParams = data.data;
+			if(returnParams!=''&& returnParams.length != 0){
+                for(var i=0; i<returnParams.length; i++){  
+                    var option="<option value=\""+returnParams[i]+"\""; 
+                    option += ">"+returnParams[i]+"--参数</option>";  //动态添加数据
+                    $("#cruisingAltitude_paramName_C900").append(option); 
+                }  
+        	} 
+			return true;
+		}
+		
+	});
+}
+
+//巡航高度，通过jobId 获取模型列表
+function cruisingAltitude_getModelsListByJobId_sync(jobId){	
+	$.ajax({
+		type: "POST",
+		url: cruisingAltitude_locate_url+'/defaultIndex/cruisingAltitude/getModelsListByJobId',
+    	data: {jobId:jobId},
+		dataType:'json',
+		cache: false,
+		async: true,  //注意，这里改成同步的方式
+		success: function(data){
+			hide_zhezhao_mask();//关闭遮罩层
+			if(data.status==1001||data.status=='1001'){
+				$("#cruisingAltitude_modelName_C900").empty();      //清空	
+				$("#cruisingAltitude_modelName_C900").select2("val", ""); 
+				var returnParams = data.data;
+				if(returnParams!='' && returnParams.length != 0){
+					$("#cruisingAltitude_modelName_C900").append("<option value=\"\"></option>"); 
+	                for(var i=0; i<returnParams.length; i++){  
+	                    var option="<option value=\""+returnParams[i]+"\""; 
+	                    option += ">"+returnParams[i]+"--模型</option>";  //动态添加数据
+	                    $("#cruisingAltitude_modelName_C900").append(option); 
+	                }  
+	        	} 
+
+				return true;
+			}else{
+				oDateAlert(data.data);
+				return false;
+			}
+			
+		}
+		
+	});
+}
+
+//巡航高度，通过jobId，模型名 获取参数列表
+function cruisingAltitude_getParamsListByModelName_sync(jobId,modelName){	
+	$.ajax({
+		type: "POST",
+		url: cruisingAltitude_locate_url+'/defaultIndex/cruisingAltitude/getParamsListByModelName',
+    	data: {jobId:jobId,modelName:modelName},
+		dataType:'json',
+		cache: false,
+		async: true,  //注意，这里改成同步的方式
+		success: function(data){
+			$("#cruisingAltitude_paramName_C900").empty();      //清空	
+			$("#cruisingAltitude_paramName_C900").select2("val", ""); 
+			var returnParams = data.data;
+			if(returnParams!=''&& returnParams.length != 0){
+                for(var i=0; i<returnParams.length; i++){  
+                    var option="<option value=\""+returnParams[i]+"\""; 
+                    option += ">"+returnParams[i]+"--参数</option>";  //动态添加数据
+                    $("#cruisingAltitude_paramName_C900").append(option); 
+                }  
+        	} 
+			return true;
+		}
+		
+	});
+}
+
+//选择任务，查询模型
+$("#cruisingAltitude_jobId_CRJ900").change(function(){
+	oDateAlert('请稍后...');
+	show_zhezhao_mask();//显示遮罩层
+	var jobId_CRJ900 = $("#cruisingAltitude_jobId_CRJ900").val();
+	cruisingAltitude_getModelsListByJobId_sync(jobId_CRJ900);
+	//置空默认勾选参数下拉框
+	$("#cruisingAltitude_paramName_C900").empty();      //清空	
+	$("#cruisingAltitude_paramName_C900").select2("val", ""); 
+});	
+//选择模型，查询参数--------------------------------------------
+$("#cruisingAltitude_modelName_C900").change(function(){
+	var cruisingAltitude_jobId_CRJ900 = $("#cruisingAltitude_jobId_CRJ900").val();
+	var cruisingAltitude_modelName_C900 = $("#cruisingAltitude_modelName_C900").val();
+	cruisingAltitude_getParamsListByModelName_sync(cruisingAltitude_jobId_CRJ900,cruisingAltitude_modelName_C900);
+});
+
+
+//根据条件，查询巡航高度
+function getCruisingAltitudeFields(jobId,modelName,paramName){
+	$.ajax({
+		type: "POST",
+		url: cruisingAltitude_locate_url+'/defaultIndex/cruisingAltitude/getCruisingAltitudeFields',
+    	data: {jobId:jobId,modelName:modelName,paramName:paramName},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			if(data.status=='1001'||data.status==1001){
+				infoCruisingaltitudesettingJson = {};
+				infoCruisingaltitudesettingJson = data.data;
+				
+				
+				$("#field1_min").val(infoCruisingaltitudesettingJson.field1_min);
+				$("#field1_max").val(infoCruisingaltitudesettingJson.field1_max);
+				
+				$("#field2_min").val(infoCruisingaltitudesettingJson.field2_min);
+				$("#field2_max").val(infoCruisingaltitudesettingJson.field2_max);
+				
+				$("#field3_min").val(infoCruisingaltitudesettingJson.field3_min);
+				$("#field3_max").val(infoCruisingaltitudesettingJson.field3_max);
+				
+				$("#field4_min").val(infoCruisingaltitudesettingJson.field4_min);
+				$("#field4_max").val(infoCruisingaltitudesettingJson.field4_max);
+					
+				//标题
+				$("#cruisingAltitude_title_param").empty();
+				$("#cruisingAltitude_title_param").val(infoCruisingaltitudesettingJson.statistics_title);
+				
+				
+			}else{
+				oDateAlert(data.data);
+				return;
+			}
+			
+		}
+		
+	});
+}
+
+
+
+
+//打开巡航高度模态框
+function cruisingAltitude_set_dlg(){
+	cruisingAltitude_myDraggleTip();
+	$("#cruisingAltitude_set__dlg").modal();
+	
+	//初始化该图形设置，从数据库查询
+	$.ajax({
+		type: "POST",
+		url: cruisingAltitude_locate_url+'/defaultIndex/cruisingAltitude/getCruisingAltitudeFields',
+    	data: {},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			if(data.status=='1001'||data.status==1001){
+				infoCruisingaltitudesettingJson = {};
+				infoCruisingaltitudesettingJson = data.data;
+				cruisingAltitude_getDataFromDB = data;
+				cruisingAltitude_selected(cruisingAltitude_getDataFromDB);
+			}
+		}
+	});
+	
+	
+	//
+	var jobId = $("#cruisingAltitude_jobId_CRJ900").val();
+	var modelName = $("#cruisingAltitude_modelName_C900").val();
+	var paramName = $("#cruisingAltitude_paramName_C900").val();
+	//根据条件，查询巡航高度
+	getCruisingAltitudeFields(jobId,modelName,paramName);
+	
+}
+
+
+//弹出框拖拽提示-------------------------------------------
+function cruisingAltitude_myDraggleTip(){
+	//弹出框拖拽提示-------------------------------------------
+	draggleTip = '';
+	draggleTip = '拖拽弹出框，以方便设置';
+	oDateAlert3(draggleTip);
+	//弹出框拖拽提示-------------------------------------------
+}
+
+
+//打开弹出框，初始化下拉框，默认从数据库查询数据
+function cruisingAltitude_selected(data){
+	if(data!=null){
+		//
+		//初始化下拉框----------------------------------------------	
+		infoCruisingaltitudesettingJson = {};
+		infoCruisingaltitudesettingJson = data.data;
+		var jobId = infoCruisingaltitudesettingJson.jobId;
+		var infoDutyScheduleList_CRJ900JsonArr = [];
+		infoDutyScheduleList_CRJ900JsonArr = data.infoDutyScheduleList_CRJ900JsonArr;
+		cruisingAltitude_set_choosed_select_Init(infoCruisingaltitudesettingJson,infoDutyScheduleList_CRJ900JsonArr);
+
+		//初始化下拉框----------------------------------------------
+	}else{
+		//缓存失效，请刷新页面
+		oDateAlert2('缓存失效，请刷新页面');
+	}
+	
+}

infosouth-admin/src/main/resources/static/oneself/customer_js/defaultIndex/defaultIndex_pitchAnalysis_set.js

@@ -0,0 +1,453 @@
+/**
+ * pitch分析设置
+ * 
+ */
+
+var pitchAnalysis_locat = (window.location+'').split('/'); 
+var pitchAnalysis_locate_url = '';
+$(function(){
+	pitchAnalysis_locat =  pitchAnalysis_locat[0]+'//'+pitchAnalysis_locat[2]+'/'+pitchAnalysis_locat[3];
+	pitchAnalysis_locate_url = pitchAnalysis_locat + '/a';
+});
+
+var pitchAnalysis_static_acType_C900 = global_acTypeArr[0];
+var pitchAnalysis_static_acType_B737 = global_acTypeArr[1];
+var pitchAnalysis_static_acType_A320 = global_acTypeArr[2];
+var pitchAnalysis_static_acType_B777 = global_acTypeArr[3];
+var pitchAnalysis_static_acType_A330 = global_acTypeArr[4];
+
+//获取数据库中保存的数据
+var pitchAnalysis_getDataFromDB = null;
+//统计类型临时变量
+var pitchAnalysis_statisticsType_Temp = '';
+
+/* **************************************不同机型起飞Pitch分析设置**开始********************************************* */
+
+//获取pitch起飞参数结果数据柱状图,没有查询条件，用于默认加载首页
+function getParamsStatisticsResultToBar(){
+	$.ajax({
+		type: "POST",
+		url: pitchAnalysis_locate_url+'/defaultIndex/infoDefaultindexParamset/getParamsStatisticsResult',
+    	data: {},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			if(data.status=='1001'||data.status==1001){
+				//
+				pitchAnalysis_getDataFromDB = data;
+				//
+				var statisticsTitle = data.statisticsTitle;
+				var statisticsType = data.statisticsType;
+				var calcuteResultArr = data.calcuteResultArr;
+				var $chart_container_width_bar=$(".chart_container_bar").width();
+				var $chart_container_height_bar=$(".chart_container_bar").height(); 
+				
+				chart_container_width_bar = $chart_container_width_bar;
+				chart_container_height_bar = $chart_container_height_bar;
+				//绘制柱状图
+				bar_chart(chart_container_width_bar, chart_container_height_bar, calcuteResultArr, statisticsType);
+				
+				
+				//更新参数名标题
+				//更新平均值还是中位数
+				$(".choose_statisticsType").empty();
+				if(statisticsType=='1')
+					$(".choose_statisticsType").append('平均值');
+				if(statisticsType=='2')
+					$(".choose_statisticsType").append('中位数');					
+				if(statisticsType=='3')
+					$(".choose_statisticsType").append('最大值');
+				if(statisticsType=='4')
+					$(".choose_statisticsType").append('最小值');	
+				//将统计类型传给临时变量
+				pitchAnalysis_statisticsType_Temp = statisticsType;
+				//更新标题-飞行参数
+				$(".choose_paramName").empty();
+				$(".choose_paramName").append(statisticsTitle);
+
+				//打开模态框，初始化所有选过的下拉框
+				pitchAnalysis_set_choosed_select_Init(data);
+				
+			}else{
+				oDateAlert2(data.data);
+				return;
+			}
+			
+		}
+		
+	});
+}
+
+//初始化所有选过的下拉框
+function pitchAnalysis_set_choosed_select_Init(data){
+	
+	if(data!=null){
+		//初始化统计类型,pitchAnalysis_statisticsType_Temp 是统计类型临时变量
+		//$("#statisticsType").val(pitchAnalysis_statisticsType_Temp).trigger("change");
+		$("#statisticsType").val(data.statisticsType).trigger("change");
+		
+		var infoDutyScheduleList_Json = data.infoDutyScheduleList_Json;
+		var infoDutyScheduleList_CRJ900JsonArr = infoDutyScheduleList_Json.infoDutyScheduleList_CRJ900JsonArr;
+		var infoDutyScheduleList_B737JsonArr = infoDutyScheduleList_Json.infoDutyScheduleList_B737JsonArr;
+		var infoDutyScheduleList_A320JsonArr = infoDutyScheduleList_Json.infoDutyScheduleList_A320JsonArr;
+		var infoDutyScheduleList_B777JsonArr = infoDutyScheduleList_Json.infoDutyScheduleList_B777JsonArr;
+		var infoDutyScheduleList_A330JsonArr = infoDutyScheduleList_Json.infoDutyScheduleList_A330JsonArr;
+		
+		var choosedJobIdByAcType = data.choosedJobIdByAcType;
+		var choosedModelNameByAcType = data.choosedModelNameByAcType;
+		var choosedParamNameByAcType = data.choosedParamNameByAcType;
+		//
+		$.each(infoDutyScheduleList_CRJ900JsonArr,function(index,infoDutyScheduleList_CRJ900JsonArrEach){					
+			if(infoDutyScheduleList_CRJ900JsonArrEach.id==choosedJobIdByAcType.jobidCrj900){
+				$("#jobId_CRJ900").val(choosedJobIdByAcType.jobidCrj900).trigger("change");
+			}
+		});	
+		//
+		$.each(infoDutyScheduleList_B737JsonArr,function(index,infoDutyScheduleList_B737JsonArrEach){					
+			if(infoDutyScheduleList_B737JsonArrEach.id==choosedJobIdByAcType.jobidB737){
+				$("#jobId_B737").val(choosedJobIdByAcType.jobidB737).trigger("change");
+			}
+		});	
+		//
+		$.each(infoDutyScheduleList_A320JsonArr,function(index,infoDutyScheduleList_A320JsonArrEach){					
+			if(infoDutyScheduleList_A320JsonArrEach.id==choosedJobIdByAcType.jobidA320){
+				$("#jobId_A320").val(choosedJobIdByAcType.jobidA320).trigger("change");
+			}
+		});	
+		//
+		$.each(infoDutyScheduleList_B777JsonArr,function(index,infoDutyScheduleList_B777JsonArrEach){					
+			if(infoDutyScheduleList_B777JsonArrEach.id==choosedJobIdByAcType.jobidB777){
+				$("#jobId_B777").val(choosedJobIdByAcType.jobidB777).trigger("change");
+			}
+		});	
+		//
+		$.each(infoDutyScheduleList_A330JsonArr,function(index,infoDutyScheduleList_A330JsonArrEach){					
+			if(infoDutyScheduleList_A330JsonArrEach.id==choosedJobIdByAcType.jobidA330){
+				$("#jobId_A330").val(choosedJobIdByAcType.jobidA330).trigger("change");
+			}
+		});	
+		
+		//查询所有模型下拉选项		
+		//getModelsListByJobId_sync(choosedJobIdByAcType.jobidCrj900);
+		//查询所有模型下拉选项		
+		//getModelsListByJobId_sync(choosedJobIdByAcType.jobidB737);
+		//查询所有模型下拉选项		
+		//getModelsListByJobId_sync(choosedJobIdByAcType.jobidA320);
+		//查询所有模型下拉选项		
+		//getModelsListByJobId_sync(choosedJobIdByAcType.jobidB777);
+		//查询所有模型下拉选项		
+		//getModelsListByJobId_sync(choosedJobIdByAcType.jobidA330);
+		
+		//如果任务id有默认选中， 将选中过的模型设为默认----------------------------------------------------------------------------
+		pitchAnalysis_jobId_CRJ900_chooseOption = '';
+		pitchAnalysis_jobId_CRJ900_chooseOption = $("#jobId_CRJ900").val();
+		pitchAnalysis_jobId_B737_chooseOption = '';
+		pitchAnalysis_jobId_B737_chooseOption = $("#jobId_B737").val();
+		pitchAnalysis_jobId_A320_chooseOption = '';
+		pitchAnalysis_jobId_A320_chooseOption = $("#jobId_A320").val();
+		pitchAnalysis_jobId_B777_chooseOption = '';
+		pitchAnalysis_jobId_B777_chooseOption = $("#jobId_B777").val();
+		pitchAnalysis_jobId_A330_chooseOption = '';
+		pitchAnalysis_jobId_A330_chooseOption = $("#jobId_A330").val();
+		
+		//选中的模型名					
+		if(pitchAnalysis_jobId_CRJ900_chooseOption!=''&&pitchAnalysis_jobId_CRJ900_chooseOption!=undefined){
+			$("#modelName_C900").val(choosedModelNameByAcType.modelnameCrj900).trigger("change");
+		}
+		if(pitchAnalysis_jobId_B737_chooseOption!=''&&pitchAnalysis_jobId_B737_chooseOption!=undefined){
+			$("#modelName_B737").val(choosedModelNameByAcType.modelnameB737).trigger("change");
+		}
+		if(pitchAnalysis_jobId_A320_chooseOption!=''&&pitchAnalysis_jobId_A320_chooseOption!=undefined){
+			$("#modelName_A320").val(choosedModelNameByAcType.modelnameA320).trigger("change");
+		}
+		if(pitchAnalysis_jobId_B777_chooseOption!=''&&pitchAnalysis_jobId_B777_chooseOption!=undefined){
+			$("#modelName_B777").val(choosedModelNameByAcType.modelnameB777).trigger("change");
+		}
+		if(pitchAnalysis_jobId_A330_chooseOption!=''&&pitchAnalysis_jobId_A330_chooseOption!=undefined){
+			$("#modelName_A330").val(choosedModelNameByAcType.modelnameA330).trigger("change");
+		}
+		//如果任务id有默认选中， 将选中过的模型设为默认---------------------------------------------------------------------------
+		
+		
+		//如果模型有默认选中，将选中过的参数设为默认------------------------------------------------------------------------------------
+		//getParamsListByModelName_sync(choosedJobIdByAcType.jobidCrj900,choosedModelNameByAcType.modelnameCrj900);
+
+		//getParamsListByModelName_sync(choosedJobIdByAcType.jobidB737,choosedModelNameByAcType.modelnameB737);
+		//查询所有参数下拉选项
+		//getParamsListByModelName_sync(choosedJobIdByAcType.jobidA320,choosedModelNameByAcType.modelnameA320);
+		//查询所有参数下拉选项
+		//getParamsListByModelName_sync(choosedJobIdByAcType.jobidB777,choosedModelNameByAcType.modelnameB777);
+		//查询所有参数下拉选项
+		//getParamsListByModelName_sync(choosedJobIdByAcType.jobidA330,choosedModelNameByAcType.modelnameA330);
+		//
+		modelName_C900_chooseOption = '';
+		modelName_C900_chooseOption = $("#modelName_C900").val();
+		if(modelName_C900_chooseOption!=''&&modelName_C900_chooseOption!=undefined){
+			$("#paramName_C900").val(choosedParamNameByAcType.paramnameCrj900).trigger("change");
+		}
+		//
+		modelName_B737_chooseOption = '';
+		modelName_B737_chooseOption = $("#modelName_B737").val();
+		if(modelName_B737_chooseOption!=''&&modelName_B737_chooseOption!=undefined){
+			$("#paramName_B737").val(choosedParamNameByAcType.paramnameB737).trigger("change");
+		}
+		//
+		modelName_A320_chooseOption = '';
+		modelName_A320_chooseOption = $("#modelName_A320").val();
+		if(modelName_A320_chooseOption!=''&&modelName_A320_chooseOption!=undefined){
+			$("#paramName_A320").val(choosedParamNameByAcType.paramnameA320).trigger("change");
+		}
+		//
+		modelName_B777_chooseOption = '';
+		modelName_B777_chooseOption = $("#modelName_B777").val();
+		if(modelName_B777_chooseOption!=''&&modelName_B777_chooseOption!=undefined){
+			$("#paramName_B777").val(choosedParamNameByAcType.paramnameB777).trigger("change");
+		}
+		//
+		modelName_A330_chooseOption = '';
+		modelName_A330_chooseOption = $("#modelName_A330").val();
+		if(modelName_A330_chooseOption!=''&&modelName_A330_chooseOption!=undefined){
+			$("#paramName_A330").val(choosedParamNameByAcType.paramnameA330).trigger("change");
+		}
+		//如果模型有默认选中，将选中过的参数设为默认------------------------------------------------------------------------------------
+	}else{
+		oDateAlert2('缓存失效，请刷新页面');
+	}
+	
+}
+
+
+//通过jobId获取模型列表
+function getModelsListByJobId(jobId,acType){	
+	$.ajax({
+		type: "POST",
+		url: pitchAnalysis_locate_url+'/defaultIndex/infoDefaultindexParamset/getModelsListByJobId',
+    	data: {jobId:jobId},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			hide_zhezhao_mask();//关闭遮罩层
+			if(data.status==1001||data.status=='1001'){
+				//置空参数下拉框
+				$("#paramName_"+acType).empty();      //清空	
+				$("#paramName_"+acType).select2("val", ""); 
+				$("#modelName_"+acType).empty();      //清空	
+				$("#modelName_"+acType).select2("val", ""); 
+				var returnParams = data.data;
+				if(returnParams!='' && returnParams.length != 0){
+					$("#modelName_"+acType).append("<option value=\"\"></option>"); 
+	                for(var i=0; i<returnParams.length; i++){  
+	                    var option="<option value=\""+returnParams[i]+"\""; 
+	                    option += ">"+returnParams[i]+"--模型</option>";  //动态添加数据
+	                    $("#modelName_"+acType).append(option); 
+	                }  
+	        	} 
+			}else{
+				oDateAlert(data.data);
+				return;
+			}
+			
+		}
+		
+	});
+}
+
+//通过jobId,模型名获取参数列表
+function getParamsListByModelName(jobId,modelName,acType){	
+	$.ajax({
+		type: "POST",
+		url: pitchAnalysis_locate_url+'/defaultIndex/infoDefaultindexParamset/getParamsListByModelName',
+    	data: {jobId:jobId,modelName:modelName},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			$("#paramName_"+acType).empty();      //清空	
+			$("#paramName_"+acType).select2("val", ""); 
+			var returnParams = data.data;
+			if(returnParams!=''&& returnParams.length != 0){
+                for(var i=0; i<returnParams.length; i++){  
+                    var option="<option value=\""+returnParams[i]+"\""; 
+                    option += ">"+returnParams[i]+"--参数</option>";  //动态添加数据
+                    $("#paramName_"+acType).append(option); 
+                }  
+        	} 
+		}
+		
+	});
+}
+
+//通过jobId获取模型列表, 同步的方式
+function getModelsListByJobId_sync(jobId,acType){	
+	$.ajax({
+		type: "POST",
+		url: pitchAnalysis_locate_url+'/defaultIndex/infoDefaultindexParamset/getModelsListByJobId',
+    	data: {jobId:jobId},
+		dataType:'json',
+		cache: false,
+		async: true,  //注意，这里改成同步的方式
+		success: function(data){
+			hide_zhezhao_mask();//关闭遮罩层
+			if(data.status==1001||data.status=='1001'){
+				//置空参数下拉框
+				$("#paramName_"+acType).empty();      //清空	
+				$("#paramName_"+acType).select2("val", ""); 
+				
+				$("#modelName_"+acType).empty();      //清空	
+				$("#modelName_"+acType).select2("val", ""); 
+				var returnParams = data.data;
+				if(returnParams!='' && returnParams.length != 0){
+					$("#modelName_"+acType).append("<option value=\"\"></option>"); 
+	                for(var i=0; i<returnParams.length; i++){  
+	                    var option="<option value=\""+returnParams[i]+"\""; 
+	                    option += ">"+returnParams[i]+"--模型</option>";  //动态添加数据
+	                    $("#modelName_"+acType).append(option); 
+	                }  
+	        	} 
+			}else{
+				oDateAlert(data.data);
+				return;
+			}
+			
+		}
+		
+	});
+}
+
+//通过jobId,模型名获取参数列表, 同步的方式
+function getParamsListByModelName_sync(jobId,modelName,acType){	
+	$.ajax({
+		type: "POST",
+		url: pitchAnalysis_locate_url+'/defaultIndex/infoDefaultindexParamset/getParamsListByModelName',
+    	data: {jobId:jobId,modelName:modelName},
+		dataType:'json',
+		cache: false,
+		async: true,  //注意，这里改成同步的方式
+		success: function(data){
+			$("#paramName_"+acType).empty();      //清空	
+			$("#paramName_"+acType).select2("val", ""); 
+			var returnParams = data.data;
+			if(returnParams!=''&& returnParams.length != 0){
+                for(var i=0; i<returnParams.length; i++){  
+                    var option="<option value=\""+returnParams[i]+"\""; 
+                    option += ">"+returnParams[i]+"--参数</option>";  //动态添加数据
+                    $("#paramName_"+acType).append(option); 
+                }  
+        	} 
+		}
+		
+	});
+}
+
+//选择任务，查询模型
+$("#jobId_CRJ900").change(function(){
+	oDateAlert('请稍后...');
+	show_zhezhao_mask();//显示遮罩层
+	var jobId_CRJ900 = $("#jobId_CRJ900").val();
+	getModelsListByJobId_sync(jobId_CRJ900,'C900');
+	
+});
+$("#jobId_B737").change(function(){
+	oDateAlert('请稍后...');
+	show_zhezhao_mask();//显示遮罩层
+	var jobId_B737 = $("#jobId_B737").val();
+	getModelsListByJobId_sync(jobId_B737,'B737');
+});
+$("#jobId_A320").change(function(){
+	oDateAlert('请稍后...');
+	show_zhezhao_mask();//显示遮罩层
+	var jobId_A320 = $("#jobId_A320").val();
+	getModelsListByJobId_sync(jobId_A320,'A320');
+});
+$("#jobId_B777").change(function(){
+	oDateAlert('请稍后...');
+	show_zhezhao_mask();//显示遮罩层
+	var jobId_B777 = $("#jobId_B777").val();
+	getModelsListByJobId_sync(jobId_B777,'B777');
+});
+$("#jobId_A330").change(function(){
+	oDateAlert('请稍后...');
+	show_zhezhao_mask();//显示遮罩层
+	var jobId_A330 = $("#jobId_A330").val();
+	getModelsListByJobId_sync(jobId_A330,'A330');
+});
+//选择模型，查询参数--------------------------------------------
+$("#modelName_C900").change(function(){
+	var jobId_CRJ900 = $("#jobId_CRJ900").val();
+	var modelName_C900 = $("#modelName_C900").val();
+	getParamsListByModelName_sync(jobId_CRJ900,modelName_C900,'C900');
+});
+$("#modelName_B737").change(function(){
+	var jobId_B737 = $("#jobId_B737").val();
+	var modelName_B737 = $("#modelName_B737").val();
+	getParamsListByModelName_sync(jobId_B737,modelName_B737,'B737');
+});
+$("#modelName_A320").change(function(){
+	var jobId_A320 = $("#jobId_A320").val();
+	var modelName_A320 = $("#modelName_A320").val();
+	getParamsListByModelName_sync(jobId_A320,modelName_A320,'A320');
+});
+$("#modelName_B777").change(function(){
+	var jobId_B777 = $("#jobId_B777").val();
+	var modelName_B777 = $("#modelName_B777").val();
+	getParamsListByModelName_sync(jobId_B777,modelName_B777,'B777');
+});
+$("#modelName_A330").change(function(){
+	var jobId_A330 = $("#jobId_A330").val();
+	var modelName_A330 = $("#modelName_A330").val();
+	getParamsListByModelName_sync(jobId_A330,modelName_A330,'A330');
+});
+
+//pitch柱状图设置打开模态框
+function pitch_set_dlg(){
+	//
+	pitch_set_myDraggleTip();
+	$('#pitch_set_dlg').modal();
+	//
+	$.ajax({
+		type: "POST",
+		url: pitchAnalysis_locate_url+'/defaultIndex/infoDefaultindexParamset/getParamsStatisticsResult',
+    	data: {},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			if(data.status=='1001'||data.status==1001){
+				var statisticsTitle = data.statisticsTitle;
+				var statisticsType = data.statisticsType;
+			
+				//更新参数名标题
+				$("#statisticsAction").empty();
+				$("#statisticsAction").val(statisticsTitle);
+				
+			}else{
+				oDateAlert2(data.data);
+				return;
+			}
+			
+		}
+		
+	});
+	//打开弹出框，初始化下拉框，从数据库查询数据
+	$.ajax({
+		type: "POST",
+		url: pitchAnalysis_locate_url+'/defaultIndex/infoDefaultindexParamset/getParamsStatisticsResult',
+    	data: {},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			if(data.status=='1001'||data.status==1001){
+				pitchAnalysis_getDataFromDB = data;
+				pitchAnalysis_set_choosed_select_Init(pitchAnalysis_getDataFromDB);
+			}
+		}
+	});
+	
+}
+
+//弹出框拖拽提示-------------------------------------------
+function pitch_set_myDraggleTip(){
+	//弹出框拖拽提示-------------------------------------------
+	draggleTip = '';
+	draggleTip = '拖拽弹出框，以方便设置';
+	oDateAlert3(draggleTip);
+	//弹出框拖拽提示-------------------------------------------
+}

infosouth-admin/src/main/resources/static/oneself/customer_js/defaultIndex/defaultIndex_verticalacceleration_set.js

@@ -0,0 +1,472 @@
+/**
+ * pitch分析设置
+ * 
+ */
+
+var verticalacceleration_locat = (window.location+'').split('/'); 
+var verticalacceleration_locate_url = '';
+$(function(){
+	verticalacceleration_locat =  verticalacceleration_locat[0]+'//'+verticalacceleration_locat[2]+'/'+verticalacceleration_locat[3];
+	verticalacceleration_locate_url = verticalacceleration_locat + '/a';
+});
+
+var verticalacceleration_static_acType_C900 = global_acTypeArr[0];
+var verticalacceleration_static_acType_B737 = global_acTypeArr[1];
+var verticalacceleration_static_acType_A320 = global_acTypeArr[2];
+var verticalacceleration_static_acType_B777 = global_acTypeArr[3];
+var verticalacceleration_static_acType_A330 = global_acTypeArr[4];
+
+//获取数据库中保存的数据
+var verticalacceleration_getDataFromDB = null;
+//统计类型临时变量
+var verticalacceleration_statisticsType_Temp = '';
+
+//查询最大垂直加速度统计结果,没有查询条件，用于默认加载首页
+function getParamsStatisticsResultToLine(){
+	$.ajax({
+		type: "POST",
+		url: verticalacceleration_locate_url+'/defaultIndex/infoDefaultindexVerticalaccelerationset/getParamsStatisticsResult',
+    	data: {},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			if(data.status=='1001'||data.status==1001){
+				//verticalacceleration_getDataFromDB
+				verticalacceleration_getDataFromDB = data;
+				//
+				var statisticsTitle = data.statisticsTitle;
+				var statisticsType = data.statisticsType;
+				var calcuteResultArr = data.calcuteResultArr;
+				//绘图
+				var $chart_container_width_line=$(".chart_container_line").width();
+				var $chart_container_height_line=$(".chart_container_line").height(); 
+				
+				chart_container_width_line = $chart_container_width_line;
+				chart_container_height_line = $chart_container_height_line;
+				line_chart(chart_container_width_line, chart_container_height_line,calcuteResultArr,statisticsType);
+				
+				
+				//更新参数名标题
+				
+				//更新平均值还是中位数
+				$(".verticalAcceleration_choose_statisticsType").empty();
+				if(statisticsType=='1')
+					$(".verticalAcceleration_choose_statisticsType").append('平均值');
+				if(statisticsType=='2')
+					$(".verticalAcceleration_choose_statisticsType").append('中位数');					
+				if(statisticsType=='3')
+					$(".verticalAcceleration_choose_statisticsType").append('最大值');
+				if(statisticsType=='4')
+					$(".verticalAcceleration_choose_statisticsType").append('最小值');
+				//更新标题-飞行参数
+				$(".verticalAcceleration_title").empty();
+				$(".verticalAcceleration_title").append(statisticsTitle);
+				
+				//将统计类型传给临时变量
+				verticalacceleration_statisticsType_Temp = statisticsType;
+				//打开模态框，初始化数据库中保存的所有选过的下拉框
+				verticalAcceleration_set_choosed_select_Init(data);
+			}else{
+				oDateAlert2(data.data);
+				return;
+			}
+			
+		}
+		
+	});
+}
+
+//初始化所有选过的下拉框
+function verticalAcceleration_set_choosed_select_Init(data){
+	if(data!=null){
+		//初始化统计类型
+		//$("#verticalAcceleration_statisticsType").val(verticalacceleration_statisticsType_Temp).trigger("change");
+		$("#verticalAcceleration_statisticsType").val(data.statisticsType).trigger("change");
+		
+		var infoDutyScheduleList_Json = data.infoDutyScheduleList_Json;
+		var infoDutyScheduleList_CRJ900JsonArr = infoDutyScheduleList_Json.infoDutyScheduleList_CRJ900JsonArr;
+		var infoDutyScheduleList_B737JsonArr = infoDutyScheduleList_Json.infoDutyScheduleList_B737JsonArr;
+		var infoDutyScheduleList_A320JsonArr = infoDutyScheduleList_Json.infoDutyScheduleList_A320JsonArr;
+		var infoDutyScheduleList_B777JsonArr = infoDutyScheduleList_Json.infoDutyScheduleList_B777JsonArr;
+		var infoDutyScheduleList_A330JsonArr = infoDutyScheduleList_Json.infoDutyScheduleList_A330JsonArr;
+		
+		var choosedJobIdByAcType = data.choosedJobIdByAcType;
+		var choosedModelNameByAcType = data.choosedModelNameByAcType;
+		var choosedParamNameByAcType = data.choosedParamNameByAcType;
+		//
+		$.each(infoDutyScheduleList_CRJ900JsonArr,function(index,infoDutyScheduleList_CRJ900JsonArrEach){					
+			if(infoDutyScheduleList_CRJ900JsonArrEach.id==choosedJobIdByAcType.jobidCrj900){
+				$("#verticalAcceleration_jobId_CRJ900").val(choosedJobIdByAcType.jobidCrj900).trigger("change");
+			}
+		});	
+		//
+		$.each(infoDutyScheduleList_B737JsonArr,function(index,infoDutyScheduleList_B737JsonArrEach){					
+			if(infoDutyScheduleList_B737JsonArrEach.id==choosedJobIdByAcType.jobidB737){
+				$("#verticalAcceleration_jobId_B737").val(choosedJobIdByAcType.jobidB737).trigger("change");
+			}
+		});	
+		//
+		$.each(infoDutyScheduleList_A320JsonArr,function(index,infoDutyScheduleList_A320JsonArrEach){					
+			if(infoDutyScheduleList_A320JsonArrEach.id==choosedJobIdByAcType.jobidA320){
+				$("#verticalAcceleration_jobId_A320").val(choosedJobIdByAcType.jobidA320).trigger("change");
+			}
+		});	
+		//
+		$.each(infoDutyScheduleList_B777JsonArr,function(index,infoDutyScheduleList_B777JsonArrEach){					
+			if(infoDutyScheduleList_B777JsonArrEach.id==choosedJobIdByAcType.jobidB777){
+				$("#verticalAcceleration_jobId_B777").val(choosedJobIdByAcType.jobidB777).trigger("change");
+			}
+		});	
+		//
+		$.each(infoDutyScheduleList_A330JsonArr,function(index,infoDutyScheduleList_A330JsonArrEach){					
+			if(infoDutyScheduleList_A330JsonArrEach.id==choosedJobIdByAcType.jobidA330){
+				$("#verticalAcceleration_jobId_A330").val(choosedJobIdByAcType.jobidA330).trigger("change");
+			}
+		});	
+		
+		//查询所有模型下拉选项		
+		//verticalAcceleration_getModelsListByJobId_sync(choosedJobIdByAcType.jobidCrj900);
+		//查询所有模型下拉选项		
+		//verticalAcceleration_getModelsListByJobId_sync(choosedJobIdByAcType.jobidB737);
+		//查询所有模型下拉选项		
+		//verticalAcceleration_getModelsListByJobId_sync(choosedJobIdByAcType.jobidA320);
+		//查询所有模型下拉选项		
+		//verticalAcceleration_getModelsListByJobId_sync(choosedJobIdByAcType.jobidB777);
+		//查询所有模型下拉选项		
+		//verticalAcceleration_getModelsListByJobId_sync(choosedJobIdByAcType.jobidA330);
+		
+		//如果任务id有默认选中， 将选中过的模型设为默认----------------------------------------------------------------------------
+		jobId_CRJ900_chooseOption = '';
+		jobId_CRJ900_chooseOption = $("#verticalAcceleration_jobId_CRJ900").val();
+		jobId_B737_chooseOption = '';
+		jobId_B737_chooseOption = $("#verticalAcceleration_jobId_B737").val();
+		jobId_A320_chooseOption = '';
+		jobId_A320_chooseOption = $("#verticalAcceleration_jobId_A320").val();
+		jobId_B777_chooseOption = '';
+		jobId_B777_chooseOption = $("#verticalAcceleration_jobId_B777").val();
+		jobId_A330_chooseOption = '';
+		jobId_A330_chooseOption = $("#verticalAcceleration_jobId_A330").val();
+		
+		//选中的模型名					
+		if(jobId_CRJ900_chooseOption!=''&&jobId_CRJ900_chooseOption!=undefined){
+			$("#verticalAcceleration_modelName_C900").val(choosedModelNameByAcType.modelnameCrj900).trigger("change");
+		}
+		if(jobId_B737_chooseOption!=''&&jobId_B737_chooseOption!=undefined){
+			$("#verticalAcceleration_modelName_B737").val(choosedModelNameByAcType.modelnameB737).trigger("change");
+		}
+		if(jobId_A320_chooseOption!=''&&jobId_A320_chooseOption!=undefined){
+			$("#verticalAcceleration_modelName_A320").val(choosedModelNameByAcType.modelnameA320).trigger("change");
+		}
+		if(jobId_B777_chooseOption!=''&&jobId_B777_chooseOption!=undefined){
+			$("#verticalAcceleration_modelName_B777").val(choosedModelNameByAcType.modelnameB777).trigger("change");
+		}
+		if(jobId_A330_chooseOption!=''&&jobId_A330_chooseOption!=undefined){
+			$("#verticalAcceleration_modelName_A330").val(choosedModelNameByAcType.modelnameA330).trigger("change");
+		}
+		//如果任务id有默认选中， 将选中过的模型设为默认---------------------------------------------------------------------------
+		
+		
+		//如果模型有默认选中，将选中过的参数设为默认------------------------------------------------------------------------------------
+		//verticalAcceleration_getParamsListByModelName_sync(choosedJobIdByAcType.jobidCrj900,choosedModelNameByAcType.modelnameCrj900);
+
+		//verticalAcceleration_getParamsListByModelName_sync(choosedJobIdByAcType.jobidB737,choosedModelNameByAcType.modelnameB737);
+		//查询所有参数下拉选项
+		//verticalAcceleration_getParamsListByModelName_sync(choosedJobIdByAcType.jobidA320,choosedModelNameByAcType.modelnameA320);
+		//查询所有参数下拉选项
+		//verticalAcceleration_getParamsListByModelName_sync(choosedJobIdByAcType.jobidB777,choosedModelNameByAcType.modelnameB777);
+		//查询所有参数下拉选项
+		//verticalAcceleration_getParamsListByModelName_sync(choosedJobIdByAcType.jobidA330,choosedModelNameByAcType.modelnameA330);
+		//
+		modelName_C900_chooseOption = '';
+		modelName_C900_chooseOption = $("#verticalAcceleration_modelName_C900").val();
+		if(modelName_C900_chooseOption!=''&&modelName_C900_chooseOption!=undefined){
+			$("#verticalAcceleration_paramName_C900").val(choosedParamNameByAcType.paramnameCrj900).trigger("change");
+		}
+		//
+		modelName_B737_chooseOption = '';
+		modelName_B737_chooseOption = $("#verticalAcceleration_modelName_B737").val();
+		if(modelName_B737_chooseOption!=''&&modelName_B737_chooseOption!=undefined){
+			$("#verticalAcceleration_paramName_B737").val(choosedParamNameByAcType.paramnameB737).trigger("change");
+		}
+		//
+		modelName_A320_chooseOption = '';
+		modelName_A320_chooseOption = $("#verticalAcceleration_modelName_A320").val();
+		if(modelName_A320_chooseOption!=''&&modelName_A320_chooseOption!=undefined){
+			$("#verticalAcceleration_paramName_A320").val(choosedParamNameByAcType.paramnameA320).trigger("change");
+		}
+		//
+		modelName_B777_chooseOption = '';
+		modelName_B777_chooseOption = $("#verticalAcceleration_modelName_B777").val();
+		if(modelName_B777_chooseOption!=''&&modelName_B777_chooseOption!=undefined){
+			$("#verticalAcceleration_paramName_B777").val(choosedParamNameByAcType.paramnameB777).trigger("change");
+		}
+		//
+		modelName_A330_chooseOption = '';
+		modelName_A330_chooseOption = $("#verticalAcceleration_modelName_A330").val();
+		if(modelName_A330_chooseOption!=''&&modelName_A330_chooseOption!=undefined){
+			$("#verticalAcceleration_paramName_A330").val(choosedParamNameByAcType.paramnameA330).trigger("change");
+		}
+		//如果模型有默认选中，将选中过的参数设为默认------------------------------------------------------------------------------------
+	}else{
+		oDateAlert2('缓存失效，请刷新页面');
+	}
+	
+}
+
+
+//打开最大垂直加速度模态框，显示上次设置过的属性
+function verticalaccelerationset_showModelDlg(){
+	$.ajax({
+		type: "POST",
+		url: verticalacceleration_locate_url+'/defaultIndex/infoDefaultindexVerticalaccelerationset/getParamsStatisticsResult',
+    	data: {},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			if(data.status=='1001'||data.status==1001){
+				var statisticsTitle = data.statisticsTitle;
+				var statisticsType = data.statisticsType;
+				var calcuteResultArr = data.calcuteResultArr;
+				
+				//更新标题-飞行参数
+				$("#verticalAcceleration_statisticsAction").empty();
+				$("#verticalAcceleration_statisticsAction").val(statisticsTitle);
+				
+			}else{
+				oDateAlert2(data.data);
+				return;
+			}
+			
+		}
+		
+	});
+	//打开弹出框，初始化下拉框，从数据库查询数据
+	$.ajax({
+		type: "POST",
+		url: verticalacceleration_locate_url+'/defaultIndex/infoDefaultindexVerticalaccelerationset/getParamsStatisticsResult',
+    	data: {},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			if(data.status=='1001'||data.status==1001){
+				//verticalacceleration_getDataFromDB
+				verticalacceleration_getDataFromDB = data;
+				verticalAcceleration_set_choosed_select_Init(verticalacceleration_getDataFromDB);
+			}
+		}
+	});
+	
+}
+
+
+
+//最大垂直加速度，通过jobId获取模型列表
+function verticalAcceleration_getModelsListByJobId(jobId,acType){	
+	$.ajax({
+		type: "POST",
+		url: verticalacceleration_locate_url+'/defaultIndex/infoDefaultindexVerticalaccelerationset/getModelsListByJobId',
+    	data: {jobId:jobId},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			hide_zhezhao_mask();//关闭遮罩层
+			if(data.status==1001||data.status=='1001'){
+				//置空参数下拉框
+				$("#verticalAcceleration_paramName_"+acType).empty();      //清空	
+				$("#verticalAcceleration_paramName_"+acType).select2("val", ""); 
+				
+				$("#verticalAcceleration_modelName_"+acType).empty();      //清空	
+				$("#verticalAcceleration_modelName_"+acType).select2("val", ""); 
+				var returnParams = data.data;
+				if(returnParams!='' && returnParams.length != 0){
+					$("#verticalAcceleration_modelName_"+acType).append("<option value=\"\"></option>"); 
+	                for(var i=0; i<returnParams.length; i++){  
+	                    var option="<option value=\""+returnParams[i]+"\""; 
+	                    option += ">"+returnParams[i]+"--模型</option>";  //动态添加数据
+	                    $("#verticalAcceleration_modelName_"+acType).append(option); 
+	                }  
+	        	} 
+			}else{
+				oDateAlert(data.data);
+				return;
+			}
+			
+		}
+		
+	});
+}
+//最大垂直加速度，通过jobId，模型名获取模型参数列表
+function verticalAcceleration_getParamsListByModelName(jobId,modelName,acType){	
+	$.ajax({
+		type: "POST",
+		url: verticalacceleration_locate_url+'/defaultIndex/infoDefaultindexVerticalaccelerationset/getParamsListByModelName',
+    	data: {jobId:jobId,modelName:modelName},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			$("#verticalAcceleration_paramName_"+acType).empty();      //清空	
+			$("#verticalAcceleration_paramName_"+acType).select2("val", ""); 
+			var returnParams = data.data;
+			if(returnParams!=''&& returnParams.length != 0){
+                for(var i=0; i<returnParams.length; i++){  
+                    var option="<option value=\""+returnParams[i]+"\""; 
+                    option += ">"+returnParams[i]+"--参数</option>";  //动态添加数据
+                    $("#verticalAcceleration_paramName_"+acType).append(option); 
+                }  
+        	} 
+		}
+		
+	});
+}
+
+
+//最大垂直加速度，通过jobId获取模型列表
+function verticalAcceleration_getModelsListByJobId_sync(jobId,acType){	
+	$.ajax({
+		type: "POST",
+		url: verticalacceleration_locate_url+'/defaultIndex/infoDefaultindexVerticalaccelerationset/getModelsListByJobId',
+    	data: {jobId:jobId},
+		dataType:'json',
+		cache: false,
+		async: true,  //注意，这里改成同步的方式
+		success: function(data){
+			hide_zhezhao_mask();//关闭遮罩层
+			if(data.status==1001||data.status=='1001'){
+				$("#verticalAcceleration_modelName_"+acType).empty();      //清空	
+				$("#verticalAcceleration_modelName_"+acType).select2("val", ""); 
+				var returnParams = data.data;
+				if(returnParams!='' && returnParams.length != 0){
+					$("#verticalAcceleration_modelName_"+acType).append("<option value=\"\"></option>"); 
+	                for(var i=0; i<returnParams.length; i++){  
+	                    var option="<option value=\""+returnParams[i]+"\""; 
+	                    option += ">"+returnParams[i]+"--模型</option>";  //动态添加数据
+	                    $("#verticalAcceleration_modelName_"+acType).append(option); 
+	                }  
+	        	} 
+			}else{
+				oDateAlert(data.data);
+				return;
+			}
+			
+		}
+		
+	});
+}
+//最大垂直加速度，通过jobId，模型名获取模型参数列表
+function verticalAcceleration_getParamsListByModelName_sync(jobId,modelName,acType){	
+	$.ajax({
+		type: "POST",
+		url: verticalacceleration_locate_url+'/defaultIndex/infoDefaultindexVerticalaccelerationset/getParamsListByModelName',
+    	data: {jobId:jobId,modelName:modelName},
+		dataType:'json',
+		cache: false,
+		async: true,  //注意，这里改成同步的方式
+		success: function(data){
+			$("#verticalAcceleration_paramName_"+acType).empty();      //清空	
+			$("#verticalAcceleration_paramName_"+acType).select2("val", ""); 
+			var returnParams = data.data;
+			if(returnParams!=''&& returnParams.length != 0){
+                for(var i=0; i<returnParams.length; i++){  
+                    var option="<option value=\""+returnParams[i]+"\""; 
+                    option += ">"+returnParams[i]+"--参数</option>";  //动态添加数据
+                    $("#verticalAcceleration_paramName_"+acType).append(option); 
+                }  
+        	} 
+		}
+		
+	});
+}
+
+
+//选择任务，查询模型
+$("#verticalAcceleration_jobId_CRJ900").change(function(){
+	oDateAlert('请稍后...');
+	show_zhezhao_mask();//显示遮罩层
+	var jobId_CRJ900 = $("#verticalAcceleration_jobId_CRJ900").val();
+	verticalAcceleration_getModelsListByJobId_sync(jobId_CRJ900,'C900');
+	
+});
+$("#verticalAcceleration_jobId_B737").change(function(){
+	oDateAlert('请稍后...');
+	show_zhezhao_mask();//显示遮罩层
+	var jobId_B737 = $("#verticalAcceleration_jobId_B737").val();
+	verticalAcceleration_getModelsListByJobId_sync(jobId_B737,'B737');
+});
+$("#verticalAcceleration_jobId_A320").change(function(){
+	oDateAlert('请稍后...');
+	show_zhezhao_mask();//显示遮罩层
+	var jobId_A320 = $("#verticalAcceleration_jobId_A320").val();
+	verticalAcceleration_getModelsListByJobId_sync(jobId_A320,'A320');
+});
+$("#verticalAcceleration_jobId_B777").change(function(){
+	oDateAlert('请稍后...');
+	show_zhezhao_mask();//显示遮罩层
+	var jobId_B777 = $("#verticalAcceleration_jobId_B777").val();
+	verticalAcceleration_getModelsListByJobId_sync(jobId_B777,'B777');
+});
+$("#verticalAcceleration_jobId_A330").change(function(){
+	oDateAlert('请稍后...');
+	show_zhezhao_mask();//显示遮罩层
+	var jobId_A330 = $("#verticalAcceleration_jobId_A330").val();
+	verticalAcceleration_getModelsListByJobId_sync(jobId_A330,'A330');
+});
+//选择模型，查询参数--------------------------------------------
+$("#verticalAcceleration_modelName_C900").change(function(){
+	var jobId_CRJ900 = $("#verticalAcceleration_jobId_CRJ900").val();
+	var modelName_C900 = $("#verticalAcceleration_modelName_C900").val();
+	verticalAcceleration_getParamsListByModelName_sync(jobId_CRJ900,modelName_C900,'C900');
+});
+$("#verticalAcceleration_modelName_B737").change(function(){
+	var jobId_B737 = $("#verticalAcceleration_jobId_B737").val();
+	var modelName_B737 = $("#verticalAcceleration_modelName_B737").val();
+	verticalAcceleration_getParamsListByModelName_sync(jobId_B737,modelName_B737,'B737');
+});
+$("#verticalAcceleration_modelName_A320").change(function(){
+	var jobId_A320 = $("#verticalAcceleration_jobId_A320").val();
+	var modelName_A320 = $("#verticalAcceleration_modelName_A320").val();
+	verticalAcceleration_getParamsListByModelName_sync(jobId_A320,modelName_A320,'A320');
+});
+$("#verticalAcceleration_modelName_B777").change(function(){
+	var jobId_B777 = $("#verticalAcceleration_jobId_B777").val();
+	var modelName_B777 = $("#verticalAcceleration_modelName_B777").val();
+	verticalAcceleration_getParamsListByModelName_sync(jobId_B777,modelName_B777,'B777');
+});
+$("#verticalAcceleration_modelName_A330").change(function(){
+	var jobId_A330 = $("#verticalAcceleration_jobId_A330").val();
+	var modelName_A330 = $("#verticalAcceleration_modelName_A330").val();
+	verticalAcceleration_getParamsListByModelName_sync(jobId_A330,modelName_A330,'A330');
+});
+//
+function verticalAcceleration_set_dlg(){
+	verticalAcceleration_myDraggleTip();
+	$("#verticalAcceleration_set_dlg").modal();
+	
+	//打开垂直高度模态框，显示上次设置过的属性
+	verticalaccelerationset_showModelDlg();
+	//初始化下拉框，从数据库中查询数据
+	//打开弹出框，初始化下拉框，从数据库查询数据
+	$.ajax({
+		type: "POST",
+		url: verticalacceleration_locate_url+'/defaultIndex/infoDefaultindexVerticalaccelerationset/getParamsStatisticsResult',
+    	data: {},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			if(data.status=='1001'||data.status==1001){
+				//verticalacceleration_getDataFromDB
+				verticalacceleration_getDataFromDB = data;
+				verticalAcceleration_set_choosed_select_Init(verticalacceleration_getDataFromDB);
+			}
+		}
+	});
+	
+}
+
+//弹出框拖拽提示-------------------------------------------
+function verticalAcceleration_myDraggleTip(){
+	//弹出框拖拽提示-------------------------------------------
+	draggleTip = '';
+	draggleTip = '拖拽弹出框，以方便设置';
+	oDateAlert3(draggleTip);
+	//弹出框拖拽提示-------------------------------------------
+}

infosouth-admin/src/main/resources/static/oneself/customer_js/defaultIndex_acTypeContrast_set.js

@@ -0,0 +1,739 @@
+/**
+ * 
+ */
+function getttt(){
+	alert('ttt');
+}
+var locat = (window.location+'').split('/'); 
+var locate_url = '';
+$(function(){
+	locat =  locat[0]+'//'+locat[2]+'/'+locat[3];
+	locate_url = locat + '/a';
+});
+
+
+//置空列名
+function acTypeContrast_empty_choose_paramName_cols(){
+	$("#choose_paramName_col1").empty();
+	$("#choose_paramName_col2").empty();
+	$("#choose_paramName_col3").empty();
+	$("#choose_paramName_col4").empty();
+}
+
+//置空计算结果
+function acTypeContrast_empty_calculateResult(){
+	$("#C900_param_col1").empty();
+	$("#C900_param_col2").empty();
+	$("#C900_param_col3").empty();
+	$("#C900_param_col4").empty();
+	$("#B737_param_col1").empty();
+	$("#B737_param_col2").empty();
+	$("#B737_param_col3").empty();
+	$("#B737_param_col4").empty();
+	$("#A320_param_col1").empty();
+	$("#A320_param_col2").empty();
+	$("#A320_param_col3").empty();
+	$("#A320_param_col4").empty();
+	$("#B777_param_col1").empty();
+	$("#B777_param_col2").empty();
+	$("#B777_param_col3").empty();
+	$("#B777_param_col4").empty();
+	$("#A330_param_col1").empty();
+	$("#A330_param_col2").empty();
+	$("#A330_param_col3").empty();
+	$("#A330_param_col4").empty();
+	
+}
+
+//打开机型数据对比模态框
+function acTypeContrast_set_dlg(){
+	$("#acTypeContrast_set_dlg").modal();
+}
+
+
+//选择机型，刷新任务下拉表
+$("#acTypeContrast_set_acTypeList").change(function(){
+	oDateAlert('请稍后...');
+	show_zhezhao_mask();//显示遮罩层
+
+	acType = '';
+	acType = $("#acTypeContrast_set_acTypeList").val();
+
+	//收集上一个机型选过的选项-开始-----------------------------------------------------------------------
+	collect_choosed_data(last_acType_Temp);
+	//收集上一个机型选过的选项-结束-----------------------------------------------------------------------
+
+	last_acType_Temp = acType;
+	
+	$.ajax({
+		type: "POST",
+		url: locate_url+'/defaultIndex/infoDefaultindexActypecontrastset/getJobListByAcType',
+    	data: {acType:acType},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			hide_zhezhao_mask();//关闭遮罩层
+			if(data.status==1001||data.status=='1001'){
+				$("#acTypeContrast_set_jobId").empty();
+				$("#acTypeContrast_set_jobId").select2("val", ""); 
+				$("#acTypeContrast_set_modelName_col1").empty();
+				$("#acTypeContrast_set_modelName_col1").select2("val", ""); 
+				$("#acTypeContrast_set_paramName_col1").empty();
+				$("#acTypeContrast_set_paramName_col1").select2("val", ""); 
+				$("#acTypeContrast_set_paramName_col1_statisticsType").empty();
+				$("#acTypeContrast_set_paramName_col1_statisticsType").select2("val", ""); 
+				
+				$("#acTypeContrast_set_modelName_col2").empty();
+				$("#acTypeContrast_set_modelName_col2").select2("val", ""); 
+				$("#acTypeContrast_set_paramName_col2").empty();
+				$("#acTypeContrast_set_paramName_col2").select2("val", ""); 
+				$("#acTypeContrast_set_paramName_col2_statisticsType").empty();
+				$("#acTypeContrast_set_paramName_col2_statisticsType").select2("val", ""); 
+				
+				$("#acTypeContrast_set_modelName_col3").empty();
+				$("#acTypeContrast_set_modelName_col3").select2("val", ""); 
+				$("#acTypeContrast_set_paramName_col3").empty();
+				$("#acTypeContrast_set_paramName_col3").select2("val", ""); 
+				$("#acTypeContrast_set_paramName_col3_statisticsType").empty();
+				$("#acTypeContrast_set_paramName_col3_statisticsType").select2("val", ""); 
+				
+				$("#acTypeContrast_set_modelName_col4").empty();
+				$("#acTypeContrast_set_modelName_col4").select2("val", ""); 
+				$("#acTypeContrast_set_paramName_col4").empty();
+				$("#acTypeContrast_set_paramName_col4").select2("val", ""); 
+				$("#acTypeContrast_set_paramName_col4_statisticsType").empty();
+				$("#acTypeContrast_set_paramName_col4_statisticsType").select2("val", ""); 
+				
+				var returnParams = data.data;
+				if(returnParams!='' && returnParams.length != 0){					
+					$("#acTypeContrast_set_jobId").append("<option value=\"\"></option>"); 
+	                for(var i=0; i<returnParams.length; i++){
+	                	returnParams_i = {};
+	                	returnParams_i = returnParams[i];
+	                    var option="<option value=\""+returnParams_i.id+"\""; 
+	                    option += ">"+returnParams_i.jobName+"--任务</option>";  //动态添加数据
+	                    $("#acTypeContrast_set_jobId").append(option); 
+	                }  
+	        	} 
+				//col1参数统计下拉框
+				var option1="<option value=\"1\">平均值</option>";
+				option1=option1+"<option value=\"2\">中位数</option>";
+				option1=option1+"<option value=\"3\">最大值</option>";
+				option1=option1+"<option value=\"4\">最小值</option>";
+                $("#acTypeContrast_set_paramName_col1_statisticsType").append(option1);  
+				//col2参数统计下拉框
+                var option2="<option value=\"1\">平均值</option>";
+                option2=option2+"<option value=\"2\">中位数</option>";
+                option2=option2+"<option value=\"3\">最大值</option>";
+                option2=option2+"<option value=\"4\">最小值</option>";
+                $("#acTypeContrast_set_paramName_col2_statisticsType").append(option2);  
+				//col3参数下拉框
+                var option3="<option value=\"1\">平均值</option>";
+                option3=option3+"<option value=\"2\">中位数</option>";
+                option3=option3+"<option value=\"3\">最大值</option>";
+                option3=option3+"<option value=\"4\">最小值</option>";
+                $("#acTypeContrast_set_paramName_col3_statisticsType").append(option3); 
+				//col4参数下拉框
+                var option4="<option value=\"1\">平均值</option>";
+                option4=option4+"<option value=\"2\">中位数</option>";
+                option4=option4+"<option value=\"3\">最大值</option>";
+                option4=option4+"<option value=\"4\">最小值</option>";
+                $("#acTypeContrast_set_paramName_col4_statisticsType").append(option4); 
+			
+				$("#acTypeContrast_set_paramName_col1_statisticsType").val('1').trigger("change");
+				$("#acTypeContrast_set_paramName_col2_statisticsType").val('2').trigger("change");
+				$("#acTypeContrast_set_paramName_col3_statisticsType").val('3').trigger("change");
+				$("#acTypeContrast_set_paramName_col4_statisticsType").val('4').trigger("change");
+			}else{
+				oDateAlert(data.data);
+				return;
+			}
+			
+		}
+		
+	});
+});
+
+//机型数据对比-通过jobid 获取模型列表
+function acTypeContrast_set_getModelsListByJobId(jobId,acType){	
+	$.ajax({
+		type: "POST",
+		url: locate_url+'/defaultIndex/infoDefaultindexActypecontrastset/getModelsListByJobId',
+    	data: {jobId:jobId},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			hide_zhezhao_mask();//关闭遮罩层
+			if(data.status==1001||data.status=='1001'){
+				var returnParams = data.data;
+				
+				$("#acTypeContrast_set_modelName_col1").empty();
+				$("#acTypeContrast_set_modelName_col1").select2("val", ""); 								
+				if(returnParams!='' && returnParams.length != 0){
+					$("#acTypeContrast_set_modelName_col1").append("<option value=\"\"></option>"); 
+	                for(var i=0; i<returnParams.length; i++){
+	                    var option="<option value=\""+returnParams[i]+"\""; 
+	                    option += ">"+returnParams[i]+"--模型</option>";  //动态添加数据
+	                    $("#acTypeContrast_set_modelName_col1").append(option); 
+	                }  
+	        	}
+				
+				$("#acTypeContrast_set_modelName_col2").empty();
+				$("#acTypeContrast_set_modelName_col2").select2("val", ""); 
+				var returnParams = data.data;
+				if(returnParams!='' && returnParams.length != 0){
+					$("#acTypeContrast_set_modelName_col2").append("<option value=\"\"></option>"); 
+	                for(var i=0; i<returnParams.length; i++){  
+	                    var option="<option value=\""+returnParams[i]+"\""; 
+	                    option += ">"+returnParams[i]+"--模型</option>";  //动态添加数据
+	                    $("#acTypeContrast_set_modelName_col2").append(option); 
+	                }  
+	        	}
+				
+				$("#acTypeContrast_set_modelName_col3").empty();
+				$("#acTypeContrast_set_modelName_col3").select2("val", ""); 
+				var returnParams = data.data;
+				if(returnParams!='' && returnParams.length != 0){
+					$("#acTypeContrast_set_modelName_col3").append("<option value=\"\"></option>"); 
+	                for(var i=0; i<returnParams.length; i++){  
+	                    var option="<option value=\""+returnParams[i]+"\""; 
+	                    option += ">"+returnParams[i]+"--模型</option>";  //动态添加数据
+	                    $("#acTypeContrast_set_modelName_col3").append(option); 
+	                }  
+	        	}
+				
+				$("#acTypeContrast_set_modelName_col4").empty();
+				$("#acTypeContrast_set_modelName_col4").select2("val", ""); 
+				var returnParams = data.data;
+				if(returnParams!='' && returnParams.length != 0){
+					$("#acTypeContrast_set_modelName_col4").append("<option value=\"\"></option>"); 
+	                for(var i=0; i<returnParams.length; i++){  
+	                    var option="<option value=\""+returnParams[i]+"\""; 
+	                    option += ">"+returnParams[i]+"--模型</option>";  //动态添加数据
+	                    $("#acTypeContrast_set_modelName_col4").append(option); 
+	                }  
+	        	}
+
+			}else{
+				oDateAlert(data.data);
+				return;
+			}
+			
+		}
+		
+	});
+}
+
+//机型数据对比-通过modelName 获取参数列表
+function acTypeContrast_set_getParamsListByModelName(jobId,modelName,acType,paramType){	
+	$.ajax({
+		type: "POST",
+		url: locate_url+'/defaultIndex/infoDefaultindexActypecontrastset/getParamsListByModelName',
+    	data: {jobId:jobId,modelName:modelName},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			hide_zhezhao_mask();//关闭遮罩层
+			if(data.status==1001||data.status=='1001'){
+				var returnParams = data.data;
+				if(paramType=='col1'){
+					if(returnParams!='' && returnParams.length != 0){
+						$("#acTypeContrast_set_paramName_col1").empty();
+						$("#acTypeContrast_set_paramName_col1").select2("val", "");
+						$("#acTypeContrast_set_paramName_col1").append("<option value=\"\"></option>"); 
+		                for(var i=0; i<returnParams.length; i++){  
+		                    var option="<option value=\""+returnParams[i]+"\""; 
+		                    option += ">"+returnParams[i]+"--参数</option>";  //动态添加数据
+		                    $("#acTypeContrast_set_paramName_col1").append(option); 
+		                }  
+		        	}
+				}else if(paramType=='col2'){
+					if(returnParams!='' && returnParams.length != 0){
+						$("#acTypeContrast_set_paramName_col2").empty();
+						$("#acTypeContrast_set_paramName_col2").select2("val", ""); 	
+						$("#acTypeContrast_set_paramName_col2").append("<option value=\"\"></option>"); 
+		                for(var i=0; i<returnParams.length; i++){  
+		                    var option="<option value=\""+returnParams[i]+"\""; 
+		                    option += ">"+returnParams[i]+"--参数</option>";  //动态添加数据
+		                    $("#acTypeContrast_set_paramName_col2").append(option); 
+		                }  
+		        	}
+				}else if(paramType=='col3'){
+					if(returnParams!='' && returnParams.length != 0){
+						$("#acTypeContrast_set_paramName_col3").empty();
+						$("#acTypeContrast_set_paramName_col3").select2("val", ""); 
+						$("#acTypeContrast_set_paramName_col3").append("<option value=\"\"></option>"); 
+		                for(var i=0; i<returnParams.length; i++){  
+		                    var option="<option value=\""+returnParams[i]+"\""; 
+		                    option += ">"+returnParams[i]+"--参数</option>";  //动态添加数据
+		                    $("#acTypeContrast_set_paramName_col3").append(option); 
+		                }  
+		        	}
+				}else if(paramType=='col4'){
+					if(returnParams!='' && returnParams.length != 0){
+						$("#acTypeContrast_set_paramName_col4").empty();
+						$("#acTypeContrast_set_paramName_col4").select2("val", ""); 
+						$("#acTypeContrast_set_paramName_col4").append("<option value=\"\"></option>"); 
+		                for(var i=0; i<returnParams.length; i++){  
+		                    var option="<option value=\""+returnParams[i]+"\""; 
+		                    option += ">"+returnParams[i]+"--参数</option>";  //动态添加数据
+		                    $("#acTypeContrast_set_paramName_col4").append(option); 
+		                }
+		        	}
+				}else{
+					
+				}
+
+			}else{
+				oDateAlert(data.data);
+				return;
+			}
+			
+		}
+		
+	});
+}
+//选择任务，查询模型
+$("#acTypeContrast_set_jobId").change(function(){
+	
+	oDateAlert('请稍后...');
+	show_zhezhao_mask();//显示遮罩层
+	acType = '';
+	acType = $("#acTypeContrast_set_acTypeList").val();
+	var acTypeContrast_set_jobId = $("#acTypeContrast_set_jobId").val();
+	acTypeContrast_set_getModelsListByJobId(acTypeContrast_set_jobId,acType);
+	
+});
+
+//选择模型，查询参数col1
+$("#acTypeContrast_set_modelName_col1").change(function(){
+	
+	oDateAlert('请稍后...');
+	show_zhezhao_mask();//显示遮罩层
+	acType = '';
+	acType = $("#acTypeContrast_set_acTypeList").val();
+	var acTypeContrast_set_jobId = $("#acTypeContrast_set_jobId").val();
+	var acTypeContrast_set_modelName_col1 = $("#acTypeContrast_set_modelName_col1").val();
+	var paramType = 'col1';
+	acTypeContrast_set_getParamsListByModelName(acTypeContrast_set_jobId,acTypeContrast_set_modelName_col1,acType,paramType);
+	
+});
+
+//选择模型，查询参数col2
+$("#acTypeContrast_set_modelName_col2").change(function(){
+	
+	oDateAlert('请稍后...');
+	show_zhezhao_mask();//显示遮罩层
+	acType = '';
+	acType = $("#acTypeContrast_set_acTypeList").val();
+	var acTypeContrast_set_jobId = $("#acTypeContrast_set_jobId").val();
+	var acTypeContrast_set_modelName_col2 = $("#acTypeContrast_set_modelName_col2").val();
+	var paramType = 'col2';
+	acTypeContrast_set_getParamsListByModelName(acTypeContrast_set_jobId,acTypeContrast_set_modelName_col2,acType,paramType);
+	
+});
+
+//选择模型，查询参数col3
+$("#acTypeContrast_set_modelName_col3").change(function(){
+	
+	oDateAlert('请稍后...');
+	show_zhezhao_mask();//显示遮罩层
+	acType = '';
+	acType = $("#acTypeContrast_set_acTypeList").val();
+	var acTypeContrast_set_jobId = $("#acTypeContrast_set_jobId").val();
+	var acTypeContrast_set_modelName_col3 = $("#acTypeContrast_set_modelName_col3").val();
+	var paramType = 'col3';
+	acTypeContrast_set_getParamsListByModelName(acTypeContrast_set_jobId,acTypeContrast_set_modelName_col3,acType,paramType);
+	
+});
+
+//选择模型，查询参数col3
+$("#acTypeContrast_set_modelName_col4").change(function(){
+	
+	oDateAlert('请稍后...');
+	show_zhezhao_mask();//显示遮罩层
+	acType = '';
+	acType = $("#acTypeContrast_set_acTypeList").val();
+	var acTypeContrast_set_jobId = $("#acTypeContrast_set_jobId").val();
+	var acTypeContrast_set_modelName_col4 = $("#acTypeContrast_set_modelName_col4").val();
+	var paramType = 'col4';
+	acTypeContrast_set_getParamsListByModelName(acTypeContrast_set_jobId,acTypeContrast_set_modelName_col4,acType,paramType);
+	
+});
+
+
+
+
+
+//保存设置所有选过的选项--------------------------
+var acTypeContrast_set_params_All_Temp = [];
+//保存设置所有选过的jobId选项--------------------------
+var acTypeContrast_set_jobId_All_Temp = [];
+
+var last_acType_Temp = "";
+
+//收集选择过的选项
+function collect_choosed_data(acType){
+
+	var acTypeContrast_set_Title = $("#acTypeContrast_set_Title").val();
+	var acTypeContrast_set_jobId = $("#acTypeContrast_set_jobId").val();
+	
+	var acTypeContrast_set_modelName_col1 = $("#acTypeContrast_set_modelName_col1").val();
+	var acTypeContrast_set_paramName_col1 = $("#acTypeContrast_set_paramName_col1").val();
+	var acTypeContrast_set_paramName_col1_statisticsType = $("#acTypeContrast_set_paramName_col1_statisticsType").val();
+	
+	var acTypeContrast_set_modelName_col2 = $("#acTypeContrast_set_modelName_col2").val();
+	var acTypeContrast_set_paramName_col2 = $("#acTypeContrast_set_paramName_col2").val();
+	var acTypeContrast_set_paramName_col2_statisticsType = $("#acTypeContrast_set_paramName_col2_statisticsType").val();
+	
+	var acTypeContrast_set_modelName_col3 = $("#acTypeContrast_set_modelName_col3").val();
+	var acTypeContrast_set_paramName_col3 = $("#acTypeContrast_set_paramName_col3").val();
+	var acTypeContrast_set_paramName_col3_statisticsType = $("#acTypeContrast_set_paramName_col3_statisticsType").val();
+	
+	var acTypeContrast_set_modelName_col4 = $("#acTypeContrast_set_modelName_col4").val();
+	var acTypeContrast_set_paramName_col4 = $("#acTypeContrast_set_paramName_col4").val();
+	var acTypeContrast_set_paramName_col4_statisticsType = $("#acTypeContrast_set_paramName_col4_statisticsType").val();
+	
+	//
+
+	if(acType=='C900'){
+		var acTypeContrast_set_params_Temp_Obj = {};
+		var acTypeContrast_set_params_Temp = [];
+		var acTypeContrast_set_jobId = $("#acTypeContrast_set_jobId").val();
+		var acTypeContrast_set_params_Temp_col1 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col1","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col1,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col1,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col1_statisticsType};
+		var acTypeContrast_set_params_Temp_col2 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col2","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col2,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col2,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col2_statisticsType};	
+		var acTypeContrast_set_params_Temp_col3 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col3","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col3,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col3,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col3_statisticsType};
+		var acTypeContrast_set_params_Temp_col4 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col4","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col4,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col4,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col4_statisticsType};
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col1);
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col2);
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col3);
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col4);
+		acTypeContrast_set_params_Temp_Obj = {"acType":acType,"jobId":acTypeContrast_set_jobId,"acTypeContrast_set_params_Temp":acTypeContrast_set_params_Temp};
+		if(acTypeContrast_set_params_All_Temp.length>0){
+			for(var i=0;i<acTypeContrast_set_params_All_Temp.length;i++){
+				var acTypeContrast_set_params_All_Temp_i = acTypeContrast_set_params_All_Temp[i];
+				//如果有相同的机型，删除该机型数据，重新添加
+				if(acType==acTypeContrast_set_params_All_Temp_i.acType){
+					acTypeContrast_set_params_All_Temp.splice(i, 1, acTypeContrast_set_params_All_Temp_i);
+					
+				}
+				acTypeContrast_set_params_All_Temp.push(acTypeContrast_set_params_Temp_Obj);
+			}
+		}else{
+			acTypeContrast_set_params_All_Temp.push(acTypeContrast_set_params_Temp_Obj);
+		}
+		
+		
+		//收集jobId
+		var acTypeContrast_set_jobId_Temp = {"acType":acType,"jobId":acTypeContrast_set_jobId};
+		if(acTypeContrast_set_jobId_All_Temp.length>0){
+			for(var i=0;i<acTypeContrast_set_jobId_All_Temp.length;i++){
+				var acTypeContrast_set_jobId_All_Temp_i = acTypeContrast_set_jobId_All_Temp[i];
+				//如果有相同的机型，删除该机型数据，重新添加
+				if(acType==acTypeContrast_set_jobId_All_Temp_i.acType){
+					acTypeContrast_set_jobId_All_Temp.splice(i, 1, acTypeContrast_set_jobId_All_Temp_i);
+					
+				}
+				acTypeContrast_set_jobId_All_Temp.push(acTypeContrast_set_jobId_Temp);
+			}
+		}else{
+			acTypeContrast_set_jobId_All_Temp.push(acTypeContrast_set_jobId_Temp);
+		}
+		
+	}
+	if(acType=='B737'){
+		var acTypeContrast_set_params_Temp_Obj = {};
+		var acTypeContrast_set_params_Temp = [];
+		var acTypeContrast_set_jobId = $("#acTypeContrast_set_jobId").val();
+		var acTypeContrast_set_params_Temp_col1 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col1","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col1,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col1,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col1_statisticsType};
+		var acTypeContrast_set_params_Temp_col2 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col2","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col2,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col2,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col2_statisticsType};	
+		var acTypeContrast_set_params_Temp_col3 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col3","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col3,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col3,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col3_statisticsType};
+		var acTypeContrast_set_params_Temp_col4 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col4","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col4,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col4,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col4_statisticsType};
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col1);
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col2);
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col3);
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col4);
+		acTypeContrast_set_params_Temp_Obj = {"acType":acType,"jobId":acTypeContrast_set_jobId,"acTypeContrast_set_params_Temp":acTypeContrast_set_params_Temp};
+		
+		if(acTypeContrast_set_params_All_Temp.length>0){
+			for(var i=0;i<acTypeContrast_set_params_All_Temp.length;i++){
+				var acTypeContrast_set_params_All_Temp_i = acTypeContrast_set_params_All_Temp[i];
+				//如果有相同的机型，删除该机型数据，重新添加
+				if(acType==acTypeContrast_set_params_All_Temp_i.acType){
+					acTypeContrast_set_params_All_Temp.splice(i, 1, acTypeContrast_set_params_All_Temp_i);
+					
+				}
+				acTypeContrast_set_params_All_Temp.push(acTypeContrast_set_params_Temp_Obj);
+			}
+		}else{
+			acTypeContrast_set_params_All_Temp.push(acTypeContrast_set_params_Temp_Obj);
+		}
+
+		//收集jobId
+		var acTypeContrast_set_jobId_Temp = {"acType":acType,"jobId":acTypeContrast_set_jobId};
+		if(acTypeContrast_set_jobId_All_Temp.length>0){
+			for(var i=0;i<acTypeContrast_set_jobId_All_Temp.length;i++){
+				var acTypeContrast_set_jobId_All_Temp_i = acTypeContrast_set_jobId_All_Temp[i];
+				//如果有相同的机型，删除该机型数据，重新添加
+				if(acType==acTypeContrast_set_jobId_All_Temp_i.acType){
+					acTypeContrast_set_jobId_All_Temp.splice(i, 1, acTypeContrast_set_jobId_All_Temp_i);
+					
+				}
+				acTypeContrast_set_jobId_All_Temp.push(acTypeContrast_set_jobId_Temp);
+			}
+		}else{
+			acTypeContrast_set_jobId_All_Temp.push(acTypeContrast_set_jobId_Temp);
+		}
+		
+	}
+	if(acType=='A320'){
+		var acTypeContrast_set_params_Temp_Obj = {};
+		var acTypeContrast_set_params_Temp = [];
+		var acTypeContrast_set_jobId = $("#acTypeContrast_set_jobId").val();
+		var acTypeContrast_set_params_Temp_col1 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col1","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col1,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col1,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col1_statisticsType};
+		var acTypeContrast_set_params_Temp_col2 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col2","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col2,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col2,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col2_statisticsType};	
+		var acTypeContrast_set_params_Temp_col3 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col3","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col3,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col3,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col3_statisticsType};
+		var acTypeContrast_set_params_Temp_col4 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col4","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col4,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col4,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col4_statisticsType};
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col1);
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col2);
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col3);
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col4);
+		acTypeContrast_set_params_Temp_Obj = {"acType":acType,"jobId":acTypeContrast_set_jobId,"acTypeContrast_set_params_Temp":acTypeContrast_set_params_Temp};
+		if(acTypeContrast_set_params_All_Temp.length>0){
+			for(var i=0;i<acTypeContrast_set_params_All_Temp.length;i++){
+				var acTypeContrast_set_params_All_Temp_i = acTypeContrast_set_params_All_Temp[i];
+				//如果有相同的机型，删除该机型数据，重新添加
+				if(acType==acTypeContrast_set_params_All_Temp_i.acType){
+					acTypeContrast_set_params_All_Temp.splice(i, 1, acTypeContrast_set_params_All_Temp_i);
+					
+				}
+				acTypeContrast_set_params_All_Temp.push(acTypeContrast_set_params_Temp_Obj);
+			}
+		}else{
+			acTypeContrast_set_params_All_Temp.push(acTypeContrast_set_params_Temp_Obj);
+		}
+				
+		//收集jobId
+		var acTypeContrast_set_jobId_Temp = {"acType":acType,"jobId":acTypeContrast_set_jobId};
+		if(acTypeContrast_set_jobId_All_Temp.length>0){
+			for(var i=0;i<acTypeContrast_set_jobId_All_Temp.length;i++){
+				var acTypeContrast_set_jobId_All_Temp_i = acTypeContrast_set_jobId_All_Temp[i];
+				//如果有相同的机型，删除该机型数据，重新添加
+				if(acType==acTypeContrast_set_jobId_All_Temp_i.acType){
+					acTypeContrast_set_jobId_All_Temp.splice(i, 1, acTypeContrast_set_jobId_All_Temp_i);
+					
+				}
+				acTypeContrast_set_jobId_All_Temp.push(acTypeContrast_set_jobId_Temp);
+			}
+		}else{
+			acTypeContrast_set_jobId_All_Temp.push(acTypeContrast_set_jobId_Temp);
+		}
+		
+	}
+	if(acType=='B777'){
+		var acTypeContrast_set_params_Temp_Obj = {};
+		var acTypeContrast_set_params_Temp = [];
+		var acTypeContrast_set_jobId = $("#acTypeContrast_set_jobId").val();
+		var acTypeContrast_set_params_Temp_col1 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col1","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col1,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col1,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col1_statisticsType};
+		var acTypeContrast_set_params_Temp_col2 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col2","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col2,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col2,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col2_statisticsType};	
+		var acTypeContrast_set_params_Temp_col3 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col3","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col3,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col3,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col3_statisticsType};
+		var acTypeContrast_set_params_Temp_col4 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col4","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col4,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col4,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col4_statisticsType};
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col1);
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col2);
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col3);
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col4);
+		acTypeContrast_set_params_Temp_Obj = {"acType":acType,"jobId":acTypeContrast_set_jobId,"acTypeContrast_set_params_Temp":acTypeContrast_set_params_Temp};
+		if(acTypeContrast_set_params_All_Temp.length>0){
+			for(var i=0;i<acTypeContrast_set_params_All_Temp.length;i++){
+				var acTypeContrast_set_params_All_Temp_i = acTypeContrast_set_params_All_Temp[i];
+				//如果有相同的机型，删除该机型数据，重新添加
+				if(acType==acTypeContrast_set_params_All_Temp_i.acType){
+					acTypeContrast_set_params_All_Temp.splice(i, 1, acTypeContrast_set_params_All_Temp_i);
+					
+				}
+				acTypeContrast_set_params_All_Temp.push(acTypeContrast_set_params_Temp_Obj);
+			}
+		}else{
+			acTypeContrast_set_params_All_Temp.push(acTypeContrast_set_params_Temp_Obj);
+		}
+				
+		//收集jobId
+		var acTypeContrast_set_jobId_Temp = {"acType":acType,"jobId":acTypeContrast_set_jobId};
+		if(acTypeContrast_set_jobId_All_Temp.length>0){
+			for(var i=0;i<acTypeContrast_set_jobId_All_Temp.length;i++){
+				var acTypeContrast_set_jobId_All_Temp_i = acTypeContrast_set_jobId_All_Temp[i];
+				//如果有相同的机型，删除该机型数据，重新添加
+				if(acType==acTypeContrast_set_jobId_All_Temp_i.acType){
+					acTypeContrast_set_jobId_All_Temp.splice(i, 1, acTypeContrast_set_jobId_All_Temp_i);
+					
+				}
+				acTypeContrast_set_jobId_All_Temp.push(acTypeContrast_set_jobId_Temp);
+			}
+		}else{
+			acTypeContrast_set_jobId_All_Temp.push(acTypeContrast_set_jobId_Temp);
+		}
+		
+	}
+	if(acType=='A330'){
+		var acTypeContrast_set_params_Temp_Obj = {};
+		var acTypeContrast_set_params_Temp = [];
+		var acTypeContrast_set_jobId = $("#acTypeContrast_set_jobId").val();
+		var acTypeContrast_set_params_Temp_col1 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col1","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col1,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col1,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col1_statisticsType};
+		var acTypeContrast_set_params_Temp_col2 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col2","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col2,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col2,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col2_statisticsType};	
+		var acTypeContrast_set_params_Temp_col3 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col3","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col3,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col3,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col3_statisticsType};
+		var acTypeContrast_set_params_Temp_col4 = {"acType":acType,"jobId":acTypeContrast_set_jobId,"col":"col4","acTypeContrast_set_modelName":acTypeContrast_set_modelName_col4,"acTypeContrast_set_paramName":acTypeContrast_set_paramName_col4,"acTypeContrast_set_paramName_statisticsType":acTypeContrast_set_paramName_col4_statisticsType};
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col1);
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col2);
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col3);
+		acTypeContrast_set_params_Temp.push(acTypeContrast_set_params_Temp_col4);
+		acTypeContrast_set_params_Temp_Obj = {"acType":acType,"jobId":acTypeContrast_set_jobId,"acTypeContrast_set_params_Temp":acTypeContrast_set_params_Temp};
+		if(acTypeContrast_set_params_All_Temp.length>0){
+			for(var i=0;i<acTypeContrast_set_params_All_Temp.length;i++){
+				var acTypeContrast_set_params_All_Temp_i = acTypeContrast_set_params_All_Temp[i];
+				//如果有相同的机型，删除该机型数据，重新添加
+				if(acType==acTypeContrast_set_params_All_Temp_i.acType){
+					acTypeContrast_set_params_All_Temp.splice(i, 1, acTypeContrast_set_params_All_Temp_i);
+					
+				}
+				acTypeContrast_set_params_All_Temp.push(acTypeContrast_set_params_Temp_Obj);
+			}
+		}else{
+			acTypeContrast_set_params_All_Temp.push(acTypeContrast_set_params_Temp_Obj);
+		}
+		
+		
+		//收集jobId
+		var acTypeContrast_set_jobId_Temp = {"acType":acType,"jobId":acTypeContrast_set_jobId};
+		if(acTypeContrast_set_jobId_All_Temp.length>0){
+			for(var i=0;i<acTypeContrast_set_jobId_All_Temp.length;i++){
+				var acTypeContrast_set_jobId_All_Temp_i = acTypeContrast_set_jobId_All_Temp[i];
+				//如果有相同的机型，删除该机型数据，重新添加
+				if(acType==acTypeContrast_set_jobId_All_Temp_i.acType){
+					acTypeContrast_set_jobId_All_Temp.splice(i, 1, acTypeContrast_set_jobId_All_Temp_i);
+					
+				}
+				acTypeContrast_set_jobId_All_Temp.push(acTypeContrast_set_jobId_Temp);
+			}
+		}else{
+			acTypeContrast_set_jobId_All_Temp.push(acTypeContrast_set_jobId_Temp);
+		}		
+	}
+	
+	
+}
+
+function acTypeContrast_set_func(){
+	var acTypeContrast_set_Title = $("#acTypeContrast_set_Title").val();
+	var choose_paramName_col1 = $("#choose_paramName_col1").val();
+	var choose_paramName_col2 = $("#choose_paramName_col2").val();
+	var choose_paramName_col3 = $("#choose_paramName_col3").val();
+	var choose_paramName_col4 = $("#choose_paramName_col4").val();
+	
+	if(acTypeContrast_set_Title==''||acTypeContrast_set_Title==undefined){
+		oDateAlert('请填写标题');
+		return;
+	}
+	if(choose_paramName_col1==''||choose_paramName_col1==undefined){
+		oDateAlert('请填写参数名');
+		return;
+	}
+	if(choose_paramName_col2==''||choose_paramName_col2==undefined){
+		oDateAlert('请填写参数名');
+		return;
+	}
+	if(choose_paramName_col3==''||choose_paramName_col3==undefined){
+		oDateAlert('请填写参数名');
+		return;
+	}
+	if(choose_paramName_col4==''||choose_paramName_col4==undefined){
+		oDateAlert('请填写参数名');
+		return;
+	}
+	//收集最后选中的机型选过的选项-开始-----------------------------------------------------------------------
+	collect_choosed_data(acType);
+	//收集最后选中的机型选过的选项-结束-----------------------------------------------------------------------
+	
+	//选择设置的列名
+	var choose_paramName_cols = {};
+	choose_paramName_cols = {"choose_paramName_col1":choose_paramName_col1,"choose_paramName_col2":choose_paramName_col2,"choose_paramName_col3":choose_paramName_col3,"choose_paramName_col4":choose_paramName_col4};
+	var reqchoose_paramName_colsString = JSON.stringify(choose_paramName_cols);
+	
+	var reqParamDataJsonString = JSON.stringify(acTypeContrast_set_params_All_Temp);
+	
+	//
+	var reqJobIdDataJsonString = JSON.stringify(acTypeContrast_set_jobId_All_Temp);
+	
+	//关闭模态框
+	$('#acTypeContrast_set_dlg').modal('hide');
+	
+	//置空列名
+	acTypeContrast_empty_choose_paramName_cols();
+	//置空之前的计算结果
+	acTypeContrast_empty_calculateResult();
+	//
+	$.ajax({
+		type: "POST",
+		url: locate_url+'/defaultIndex/infoDefaultindexActypecontrastset/getParamsStatisticsResult_Table',
+    	data: {acTypeContrast_set_Title:acTypeContrast_set_Title,reqParamDataJsonString:reqParamDataJsonString,reqJobIdDataJsonString:reqJobIdDataJsonString,reqchoose_paramName_colsString:reqchoose_paramName_colsString},
+		dataType:'json',
+		cache: false,
+		success: function(data){
+			if(data.status=='1001'||data.status==1001){
+				allCalcuteResultArr = [];
+				allCalcuteResultArr = data.data;
+				//填充选中设置的列名
+				choose_paramNameJson = {};
+				choose_paramNameJson = data.choose_paramNameJson;
+				showChoose_paramName(choose_paramNameJson);
+				
+				for(var i=0;i<allCalcuteResultArr.length;i++){
+					allCalcuteResultArr_i = {};
+					allCalcuteResultArr_i = allCalcuteResultArr[i];
+					//一个机型所有参数计算结果
+					oneAcTypeCalcuteResultArr = [];
+					oneAcTypeCalcuteResultArr = allCalcuteResultArr_i.oneAcTypeCalcuteResultArr;
+					//显示新的计算结果
+					showOneAcTypeCalcuteResult(allCalcuteResultArr_i.acType,oneAcTypeCalcuteResultArr);
+				}
+				//
+				alert('成功');
+			}else{
+				oDateAlert(data.data);
+				return;
+			}
+			
+		}
+		
+	});
+	
+	//显示新的计算结果
+	function showOneAcTypeCalcuteResult(acType,oneAcTypeCalcuteResultArr){
+		$.each(oneAcTypeCalcuteResultArr,function(index,oneAcTypeCalcuteResultArr_j){
+			//4个参数的计算结果
+			if(oneAcTypeCalcuteResultArr_j.statisticsType=='1'){
+				$("#"+acType+"_param_col"+oneAcTypeCalcuteResultArr_j.colIndex).text(oneAcTypeCalcuteResultArr_j.avg);
+			}
+			if(oneAcTypeCalcuteResultArr_j.statisticsType=='2'){
+				$("#"+acType+"_param_col"+oneAcTypeCalcuteResultArr_j.colIndex).text(oneAcTypeCalcuteResultArr_j.median);				
+			}
+			if(oneAcTypeCalcuteResultArr_j.statisticsType=='3'){
+				$("#"+acType+"_param_col"+oneAcTypeCalcuteResultArr_j.colIndex).text(oneAcTypeCalcuteResultArr_j.max);
+			}
+			if(oneAcTypeCalcuteResultArr_j.statisticsType=='4'){
+				$("#"+acType+"_param_col"+oneAcTypeCalcuteResultArr_j.colIndex).text(oneAcTypeCalcuteResultArr_j.min);
+			}
+			
+		});
+		
+	}
+	
+	
+	//填充选中设置的列名
+	function showChoose_paramName(choose_paramNameJson){	
+		$("#show_choose_paramName_col1").val(choose_paramNameJson.choose_paramName_col1);
+		$("#show_choose_paramName_col2").val(choose_paramNameJson.choose_paramName_col2);
+		$("#show_choose_paramName_col3").val(choose_paramNameJson.choose_paramName_col3);
+		$("#show_choose_paramName_col4").val(choose_paramNameJson.choose_paramName_col4);
+	}
+	
+}

infosouth-admin/src/main/resources/static/oneself/customer_js/listen_jobs_status.js

@@ -0,0 +1,169 @@
+
+        var Chat = {};  
+  
+        Chat.socket = null;  
+  
+        function mywebsocketMsg(getJobs_Status_Uri){
+        	Chat.connect = (function(host) {  
+                if ('WebSocket' in window) {  
+                    Chat.socket = new WebSocket(host);  
+                } else if ('MozWebSocket' in window) {  
+                    Chat.socket = new MozWebSocket(host);  
+                } else {  
+                    Console.log('Error: WebSocket is not supported by this browser.');  
+                    return;  
+                }  
+      
+                Chat.socket.onopen = function () {  
+                    Console.log('Info: WebSocket connection opened.');  
+                   
+                };  
+      
+                Chat.socket.onclose = function () {  
+                    
+                    Console.log('Info: WebSocket closed.');  
+                };  
+      
+                Chat.socket.onmessage = function (message) {  
+                	var respDataStr = message.data;
+                	var respData = JSON.parse(respDataStr);
+                	var returnData = respData.returnData;
+                	//遍历节点
+                	for(var i=0;i<returnData.length;i++){            		  
+                		//节点名
+                		var nodeName=returnData[i].nodeName;
+                		var jobsExecStatusData=returnData[i].jobsExecStatusData;
+                		for(var j=0;j<jobsExecStatusData.length;j++){ 
+                			jobsExecStatusObj = {};
+                			jobsExecStatusObj = jobsExecStatusData[j];
+                			jobId = jobsExecStatusObj.jobID;
+                			jobStatus = jobsExecStatusObj.jobStatus;
+                			newjobStatus = jobStatus;
+    
+                			old_execute_status = $(".execute_status_"+jobId).val();
+                			if(old_execute_status!='-1'&&old_execute_status!='-2'&&old_execute_status!=-1&&old_execute_status!=-2&&old_execute_status!=''){ 
+                				$(".execute_job_"+jobId).empty();	
+                			}
+                			
+                			               			
+                			if(jobStatus=='1'){
+                				
+                				if(old_execute_status!='-1'&&old_execute_status!='-2'&&old_execute_status!=-1&&old_execute_status!=-2&&old_execute_status!=''){                					
+                					jobStatus = '运行完成';
+                
+                					$(".execute_job_"+jobId).append("执行");
+                					newjobStatus = 2;
+                				}
+                				
+                			}
+                			else if(jobStatus=='2'){
+                				
+                				if(old_execute_status!='-1'&&old_execute_status!='-2'&&old_execute_status!=-1&&old_execute_status!=-2){
+                	
+                					jobStatus = '正在运行';
+                					$(".execute_job_"+jobId).append("停止");
+                					newjobStatus = 0;
+                				}
+                				
+                			}
+                			else if(jobStatus=='3'){
+                				
+                				if(old_execute_status!='-1'&&old_execute_status!='-2'&&old_execute_status!=-1&&old_execute_status!=-2&&old_execute_status!=''){
+                		
+                					jobStatus = '错误';
+                					$(".execute_job_"+jobId).append("停止");
+                					newjobStatus = 0;
+                				}
+                				
+                			}else if(jobStatus=='6'){
+                				
+                				if(old_execute_status!='-1'&&old_execute_status!='-2'&&old_execute_status!=-1&&old_execute_status!=-2&&old_execute_status!=''){
+                				
+                					jobStatus = '文件不存在';
+                					$(".execute_job_"+jobId).append("停止");
+                					newjobStatus = 0;
+                				}
+                				
+                			}	
+                			else{
+                				
+                				if(old_execute_status!='-1'&&old_execute_status!='-2'&&old_execute_status!=-1&&old_execute_status!=-2&&old_execute_status!=''){
+                					
+                					 
+                            		jobStatus = '错误';
+                					$(".execute_job_"+jobId).append("停止");
+                					newjobStatus = 0;
+                				}
+                				
+                			}
+
+                			
+                    		
+                    		//
+                    					
+    						
+    						//开关临时状态
+                    		if(old_execute_status!='-1'&&old_execute_status!='-2'&&old_execute_status!=-1&&old_execute_status!=-2&&old_execute_status!=''){
+                    			$(".jobStatus_"+jobId).empty();
+                        		$(".jobStatus_"+jobId).append(jobStatus); 
+                        		$(".execute_status_"+jobId).val(newjobStatus);
+                    		}
+                    		
+                    		    						
+    						
+                		}
+                	}
+                };  
+            });  
+      
+            Chat.initialize = function() {  
+            	console.log(''+window.location.protocol);
+            	if (window.location.protocol == 'http:') { 
+                    Chat.connect('ws://' + getJobs_Status_Uri);  
+                } else {  
+                	Console.log(''+window.location.host);
+                    Chat.connect('wss://' + getJobs_Status_Uri); 
+                }  
+            };  
+      
+            Chat.sendMessage = (function() {  
+                
+            });  
+      
+            var Console = {};  
+      
+            Console.log = (function(message) {  
+               
+            });  
+      
+            Chat.initialize();  
+      
+      
+            document.addEventListener("DOMContentLoaded", function() {  
+                // Remove elements with "noscript" class - <noscript> is not allowed in XHTML  
+                var noscripts = document.getElementsByClassName("noscript");  
+                for (var i = 0; i < noscripts.length; i++) {  
+                    noscripts[i].parentNode.removeChild(noscripts[i]);  
+                }  
+            }, false); 
+        }
+         
+        
+      //判断dom有没有指定class
+        var rclass = /[\t\r\n\f]/g;
+        jQuery.fn.extend({
+            hasClass: function(selector) {
+                var className = " " + selector + " ",
+                    i = 0,
+                    l = this.length;
+                for (; i < l; i++) {
+                    if (this[i].nodeType === 1 &&
+                        (" " + this[i].className + " ").replace(rclass, " ").indexOf(className) > -1) {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+        });
+  

infosouth-admin/src/main/resources/static/oneself/customer_js/rgbTo16.js

@@ -0,0 +1,80 @@
+var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/;
+/*RGB颜色转换为16进制*/
+String.prototype.colorHex = function(){
+     var that = this;
+     if(/^(rgb|RGB)/.test(that)){
+          var aColor = that.replace(/(?:\(|\)|rgb|RGB)*/g,"").split(",");
+          var strHex = "#";
+          for(var i=0; i<aColor.length; i++){
+               var hex = Number(aColor[i]).toString(16);
+               if(hex === "0"){
+                    hex += hex;    
+               }
+               strHex += hex;
+          }
+          if(strHex.length !== 7){
+               strHex = that;    
+          }
+          return strHex;
+     }else if(reg.test(that)){
+          var aNum = that.replace(/#/,"").split("");
+          if(aNum.length === 6){
+               return that;    
+          }else if(aNum.length === 3){
+               var numHex = "#";
+               for(var i=0; i<aNum.length; i+=1){
+                    numHex += (aNum[i]+aNum[i]);
+               }
+               return numHex;
+          }
+     }else{
+          return that;    
+     }
+};
+
+//-------------------------------------------------
+
+/*16进制颜色转为RGB格式*/
+String.prototype.colorRgb = function(){
+     var sColor = this.toLowerCase();
+     if(sColor && reg.test(sColor)){
+          if(sColor.length === 4){
+               var sColorNew = "#";
+               for(var i=1; i<4; i+=1){
+                    sColorNew += sColor.slice(i,i+1).concat(sColor.slice(i,i+1));    
+               }
+               sColor = sColorNew;
+          }
+          //处理六位的颜色值
+          var sColorChange = [];
+          for(var i=1; i<7; i+=2){
+               sColorChange.push(parseInt("0x"+sColor.slice(i,i+2)));    
+          }
+          return "RGB(" + sColorChange.join(",") + ")";
+     }else{
+          return sColor;    
+     }
+};
+
+
+
+/*function (){
+     var sColor = this.toLowerCase();
+     if(sColor && reg.test(sColor)){
+          if(sColor.length === 4){
+               var sColorNew = "#";
+               for(var i=1; i<4; i+=1){
+                    sColorNew += sColor.slice(i,i+1).concat(sColor.slice(i,i+1));    
+               }
+               sColor = sColorNew;
+          }
+          //处理六位的颜色值
+          var sColorChange = [];
+          for(var i=1; i<7; i+=2){
+               sColorChange.push(parseInt("0x"+sColor.slice(i,i+2)));    
+          }
+          return "RGB(" + sColorChange.join(",") + ")";
+     }else{
+          return sColor;    
+     }
+}*/

infosouth-admin/src/main/resources/static/oneself/customer_js/showcsv/myChartApi.js

@@ -0,0 +1,364 @@
+var myChartApi_locat = (window.location+'').split('/'); 
+var myChartApi_locate_url = '';
+$(function(){
+	myChartApi_locat =  myChartApi_locat[0]+'//'+myChartApi_locat[2]+'/'+myChartApi_locat[3];
+	myChartApi_locate_url = myChartApi_locat + '/a';
+});
+
+//Echarts绘图
+function echart_mychart(xaxis_data,yaxis_mySeries,clicked_columnNamesArr,allYAxis_scale){
+	// 基于准备好的dom，初始化echarts实例
+    var myChart = echarts.init(document.getElementById('main_chart'));
+
+    // 指定图表的配置项和数据
+    var option = {
+        title: {
+            text: ''
+        },
+        tooltip: {
+        	trigger: 'axis',
+	        axisPointer: {
+	            type: 'cross',
+	            animation: false,
+	            label: {
+	                backgroundColor: '#0D4286'
+	            }
+	        }
+        },
+        dataZoom: [
+          {
+	        show: true,
+	        realtime: true,
+	        start: 0,
+	        end: 5,
+	        // backgroundColor:'#d'
+	        textStyle: {
+	            color: "#ffffff"
+	        }
+          },
+	       {
+		        type: 'inside',
+		        realtime: true,
+		        start: 5,
+		        end: 85
+		    }
+	    ],
+	    grid: {
+	        top: '10%',
+	        left: '2%',
+	        right: '1%',
+	        bottom: '14%',
+	        containLabel: true
+	    },
+        legend: {
+            data:clicked_columnNamesArr
+        },
+        xAxis: {
+            data: xaxis_data
+        },
+        yAxis: allYAxis_scale,              
+	    series: yaxis_mySeries
+    };
+    
+    // 使用刚指定的配置项和数据显示图表。
+    myChart.setOption(option);
+    window.onresize = function(){
+    	myChart.resize();
+    }
+    
+    //将图形对象存进数组，myLineChartArr 是全局变量
+    myLineChartArr.push(myChart);
+}
+
+
+		//根据设置的图形属性，请求刷新图形
+		function req_refresh_chart(fid){
+			$.ajax({
+				type: "POST",
+				url: myChartApi_locate_url+'/csvmanager/showCsv/getChartData',
+		    	data: {fid:fid,columnsName:columnsNameStr},
+				dataType:'json',
+				cache: false,
+				success: function(data){
+					hide_zhezhao_mask();//关闭遮罩层
+					//注销之前的图形缓存，1个以上的图表	
+					disposeHistoryChatObjArr();
+					if(data.status=='1001'){
+						var chartData = data.data;
+
+						//选择的图表列名
+						var clicked_columnNamesArr = chartData.clicked_columnNamesArr;
+						var colsGroup = chartData.colsGroup;					
+						//检测所有点过的参数是否在同一组里面，是，true,否false
+						check_is_one_groupFlag = check_is_one_group(colsGroup);
+						
+						//选择的字符串列名
+						var clicked_string_columnNamesArr = chartData.clicked_string_columnNamesArr;
+						//该列行数
+						var countArr = chartData.chartXData;
+						
+						//该列所有行数据
+						var clicked_chartYData = chartData.clicked_chartYData;					
+						//所有点过的列数据,显示用
+						var chartDataSets = [];
+						//画图中的series参数
+						var mySeries = [];
+						//
+						var allYAxis_scale = [];
+						if(clicked_columnNamesArr!=null&&clicked_columnNamesArr.length>0){
+							var columnsNameStrArr = [];
+							columnsNameStrArr = clicked_columnNamesArr;
+							var columnsNameStrArrSize = clicked_columnNamesArr.length;
+							
+							for(var j=0;j<columnsNameStrArrSize;j++){					
+								var col_chartYData = clicked_chartYData[j].colData;
+								//
+								mySeries_data_i = {"name":clicked_columnNamesArr[j],"type":"line","data":col_chartYData,"yAxisIndex":j};//
+								mySeries.push(mySeries_data_i);
+								//
+								createOneyAxis_scale_position = '';
+								if(j%2==0){
+									createOneyAxis_scale_position = 'left';
+								}else{
+									createOneyAxis_scale_position = 'right';
+								}
+								//每个参数的y轴
+								allYAxis_scale.push(createOneyAxis_scale(clicked_columnNamesArr[j],createOneyAxis_scale_position,j));
+							}
+							//Echarts 绘图
+							echart_mychart(countArr,mySeries,clicked_columnNamesArr,allYAxis_scale);	
+						}
+						
+						
+
+						//将字符串数据显示在表格
+						var clicked_stringData = [];
+						clicked_stringData = chartData.clicked_stringData;
+						loadAll(clicked_string_columnNamesArr, clicked_stringData);
+						if(clicked_stringData.length>0){						
+							oDateAlert('所选参数含有不可数值化的值,请查看表格！');
+						}
+					}else if(data.status=='1002'){
+						hide_zhezhao_mask();//关闭遮罩层
+						oDateAlert('返回数据异常');
+						console.log('1002返回数据异常');
+						
+						return;
+					}else if(data.status=='1003'){
+						hide_zhezhao_mask();//关闭遮罩层
+						oDateAlert('所选参数含有不可数值化的值,被忽略！');
+						console.log('1003sorry,该参数含有字符串，无法图表化！');
+						
+						return;
+					}else if(data.status=='1004'){					
+						console.log('1004没有参数可查询！');
+						hide_zhezhao_mask();//关闭遮罩层
+						return;
+					}else if(data.status=='1005'){	
+						//注销之前的图形缓存
+						myLineChart.destroy();
+						//空图表------------------------------
+						myLineChart = new Chart(ctx, {
+						    type: 'line',
+						    data: [],
+						    options: 'top' //'bottom''left''top''right'
+						});
+						//空图表-结束------------------------------
+						console.log('1005没有参数可查询！');
+						hide_zhezhao_mask();//关闭遮罩层
+						return;
+					}else if(data.status=='1006'){	
+						//注销之前的图形缓存
+						myLineChart.destroy();
+						//显示字符串
+						console.log('1006显示字符串！');
+						hide_zhezhao_mask();//关闭遮罩层
+						return;
+					}else if(data.status=='1010'){	
+						//注销之前的图形缓存
+						myLineChart.destroy();
+						//显示字符串
+						oDateAlert('设置的x轴刻度过大，请重新设置！');
+						console.log('设置的x轴刻度过大，请重新设置！');
+						hide_zhezhao_mask();//关闭遮罩层
+						return;
+					}else{
+						hide_zhezhao_mask();//关闭遮罩层
+						oDateAlert('返回数据异常，可能是系统错误');
+						console.log('返回数据异常，可能是系统错误');
+						return;
+					}
+					console.log('返回图表数据成功');
+				}
+			});
+			hide_zhezhao_mask();//关闭遮罩层
+			console.log('ok');
+			
+		}
+		
+		
+		//创建一个y轴刻度
+		function createOneyAxis_scale(colName,createOneyAxis_scale_position,j){
+			offset_size = 0;
+			if(j%2==0){
+				offset_size = 0-(j/2)*60;
+			}else{
+				offset_size = 0-((j-1)/2)*60;
+			}
+			
+			if(j>6){
+				oDateAlert('图形中参数比较多，请减少勾选的参数，以便更好的观察！');
+			}
+			oneyAxis_scale = {};
+			oneyAxis_scale = {
+                boundaryGap: [0, '50%'],
+                axisLine: {
+                    lineStyle: {
+                        color: '#000'
+                    }
+                },
+                type: 'value',
+                name: colName,
+                position: createOneyAxis_scale_position,
+                offset: offset_size,
+                splitNumber: 10,
+                /*axisLabel: {
+                    formatter: '{value}',
+                    textStyle: {
+                        color: '#FFFFFF'
+                    }
+                },*/
+                splitLine: {
+                    show: false
+                }
+            }
+			return oneyAxis_scale;
+		}
+		
+		
+		function loadAll(header, response) {
+	  		$("#thead_string_columnsname").empty();
+	  		$("#tbody_string_columnsname").empty();
+	  		if(header.length>0&&response.length>0){
+	  			 currIndex = 0;
+	  			  //header
+	  			  var header_html = '';
+	  			  header_html+='<tr>';
+	  			  header_html+='<th>';
+	  			  header_html+= '序号';
+	  			  header_html+='</th>';
+	  			  for(var j=0;j<header.length;j++){			  
+	  				  header_html+='<th>';
+	  				  header_html+=header[j];
+	  				  header_html+='</th>';			  
+	  			  }
+	  			  header_html+='</tr>';
+	  			  //$("#thead_string_columnsname").empty();  	  		
+	  			  $("#thead_string_columnsname").append(header_html);	
+	  			  //$("#tbody_string_columnsname").empty();
+	  			  
+	  			  var pageSize = 100;
+	  			  //数据分组， 每组100条，
+	  			  var groups = group(response,pageSize);		  
+	  			  for (var i = 0; i < groups.length; i++) {
+	  			    //闭包， 保持i值的正确性
+	  			    window.setTimeout(function () {
+	  			      var group = groups[i];
+	  			      var index = i + 1;
+	  			      return function () {
+	  			        //分批渲染
+	  			        loadPart( group, index, pageSize);
+	  			      }
+	  			    }(), 2);
+	  			    
+	  			 }
+	  		}
+	  		
+		}
+			 
+			//数据分组函数（每组500条）
+			function group(response,pageSize) {
+				//	var data = eval(response.qarData);
+				var data=response;
+				  var result = [];
+				  var groupItem;
+				  for (var i=0;i<data.length;i++) {
+				    if (i % pageSize == 0) {
+				      groupItem != null && result.push(groupItem);
+				      groupItem = [];
+				    }
+				    groupItem.push(data[i]);
+				  }
+				  result.push(groupItem);				  
+				  return result;
+			}
+			//表格行数分页索引
+			var currIndex = 0;
+			
+			function loadPart(group, index, pageSize) {
+			      var currPageCount = parseInt(pageSize*currIndex);
+				  var html = "";
+				  for (var i = 0; i < group.length; i++) {				 
+					currPageCount+=1;
+					html += "<tr><td class=\"center\" style=\"width: 30px;\">"+currPageCount+"</td>";
+				    var jsonitem = group[i];
+				    var item=jsonitem;
+				    var arr=item.split(",");
+				    for(var j=0;j<arr.length;j++){
+				    	html+="<td>"+arr[j]+"</td>";
+				    }
+				    html+="</tr>";
+				  }
+				  //保证顺序不错乱
+				  while (index-currIndex==1) {
+				    $("#tbody_string_columnsname").append(html);
+				    currIndex = index;
+				  }
+			}
+			
+			
+			//参数导出
+			function paramExport(){		
+				console.log('导出的参数有：'+columnsNameStr);
+				var trclassArr = clicked_checkboxValue.substring(0,clicked_checkboxValue.length-1).split(",");
+				var fid = '';
+				for(var i=0;i<trclassArr.length;i++){
+					var lineId = trclassArr[i];
+					//除去 selected 标签
+					var fidStr = lineId.split(';');
+					fid = fidStr[0];
+					var linei = fidStr[1];
+				}
+				console.log('fid = ' + fid);
+				
+				if(columnsNameStr==''||columnsNameStr==""||columnsNameStr==undefined){
+					oDateAlert('请勾选参数');
+					console.log('请勾选参数');				
+					return;
+				}
+				fidChooseRow = '';
+				fidChooseRow = $("#fidChooseRow_input").val();
+				console.log('fidChooseRow = ' + fidChooseRow);
+				if(fidChooseRow==''||fidChooseRow==""||fidChooseRow==undefined){
+					oDateAlert('请选择相应的任务');
+					console.log('请选择相应的任务');				
+					return;
+				}
+				
+				if(fid==''||fid==""||fid==undefined){
+					oDateAlert('请选择相应的任务');
+					console.log('请选择相应的任务');				
+					return;
+				}
+				oDateAlert('正在准备导出，请稍后...');
+				export_url = myChartApi_locate_url+"/csvmanager/showCsv/exportSelectRows?columnsNameStr="+columnsNameStr+"&fid="+fid;
+				window.location.href=export_url;
+			}
+			
+			//注销之前的图形缓存，1个以上的图表	
+			function disposeHistoryChatObjArr(){
+				//注销之前的图形缓存，1个以上的图表	
+				for(var charti=0;charti<myLineChartArr.length;charti++){
+					myLineChartArr[charti].dispose();		
+				}
+			}	

infosouth-admin/src/main/resources/static/oneself/customer_js/showcsv/myMultiChartApi.js

@@ -0,0 +1,687 @@
+var myChartApi_locat = (window.location+'').split('/'); 
+var myChartApi_locate_url = '';
+$(function(){
+	myChartApi_locat =  myChartApi_locat[0]+'//'+myChartApi_locat[2]+'/'+myChartApi_locat[3];
+	myChartApi_locate_url = myChartApi_locat + '/a';
+});
+
+var myChart = echarts.init(document.getElementById('main_chart'));
+//Echarts绘图
+function echart_mychart(xaxis_data,yaxis_mySeries,clicked_columnNamesArr,allYAxis_scale,myChartPropertySettingJson_New){
+	//基于准备好的dom，初始化echarts实例
+	myChart = null;
+	
+	//基于准备好的dom，初始化echarts实例
+	myChart = echarts.init(document.getElementById('main_chart'));
+	//y轴个数数组
+	yAxisIndexArr = [];
+	for(var yAxis_scale_i=0;yAxis_scale_i<allYAxis_scale.length;yAxis_scale_i++){
+		yAxisIndexArr.push(yAxis_scale_i);
+	}
+	//全局颜色，会变
+	//var whole_chartLine_colorArr = ['#c23531','#2f4554','#61a0a8','#d48265','#91c7ae','#749f83','#ca8622','#bda29a','#6e7074','#546570','#c4ccd3'];
+	var whole_chartLine_colorArr = ['#3784D4','#0DCB5F','#9AD873','#5DBBE1','#75D3DF','#F36059','#FA9253','#F4D371','#D1EA85','#546570','#c4ccd3'];	
+	//默认颜色，10个，不变
+	var whole_chartLine_colorArrDefault = whole_chartLine_colorArr;
+	//
+
+	//默认只有12种颜色设置，如果参数少于12个，则获取参数的序号，将自定义的颜色取代默认的参数颜色，如果参数多于12个，则增加颜色
+	whole_chartLine_colorArr = get_whole_chartLine_colorArr(yaxis_mySeries,thisParam_linePropertyArr,whole_chartLine_colorArr,whole_chartLine_colorArrDefault);
+	//如果有设置过新的图形标题
+	var customer_chart_title = '';
+	if(refreshChartTitleFlag){
+		customer_chart_title = setChartTitleJson.chart_xAxis_title;
+	}
+	
+		
+    // 指定图表的配置项和数据
+    var option = {
+        title: {
+            text: setChartTitleJson.chart_yAxis_title,
+            textStyle: {
+            	color: setChartTitleJson.chart_yAxis_color,
+            	fontFamily: 'Microsoft YaHei'
+            },
+            /*left:'49%',
+            top: '50%'*/
+        },
+        color:whole_chartLine_colorArr,
+        tooltip: {
+        	show: true,
+        	trigger: 'axis',
+	        axisPointer: {
+	            type: 'cross',
+	            animation: false,
+	            label: {
+	                backgroundColor: '#0D4286'
+	            }
+	        },
+	        feature: {
+	            dataZoom: {
+	                yAxisIndex: 'none'
+	            },
+	            dataView: {readOnly: false},
+	            magicType: {type: ['line', 'bar']},
+	            restore: {},
+	            saveAsImage: {}
+	        }
+        },
+        dataZoom: [
+          {	        
+	        // 这个dataZoom组件，默认控制x轴。slider 表示滑动条型
+            type: 'slider', // 这个 dataZoom 组件是 slider 型 dataZoom 组件
+            xAxisIndex: 0,
+	        start: 0,
+	        end: 100,
+	        // backgroundColor:'#d'
+	        textStyle: {
+	            color: "#555"
+	        }
+          },
+          {
+        	  //在坐标系内进行拖动，以及用滚轮（或移动触屏上的两指滑动）进行缩放  
+        	  type: 'inside',
+              xAxisIndex: 0,
+              start: 0,
+              end: 5
+           },
+           {
+               type: 'slider',
+               yAxisIndex: yAxisIndexArr,
+               start: 0,
+               end: 100
+           },
+           {
+               type: 'inside',
+               yAxisIndex: yAxisIndexArr,
+               start: 0,
+               end: 100
+           }
+	    ],
+	    grid: {
+	        top: '10%',
+	        left: '2%',
+	        right: '1%',
+	        bottom: '14%',
+	        containLabel: true
+	    },
+        legend: {
+            data:clicked_columnNamesArr
+        },
+        xAxis: {
+            data: xaxis_data,
+            name: setChartTitleJson.chart_xAxis_title,
+            nameLocation: 'center',
+            nameTextStyle: {
+            	fontWeight: 'bolder',
+            	fontSize: 18,
+            	verticalAlign: 'bottom',
+            	padding: [13, 0, 0, 0],
+            	color: setChartTitleJson.chart_xAxis_color,
+            	fontFamily: 'Microsoft YaHei'
+            }
+        },
+        yAxis: allYAxis_scale,              
+	    series: yaxis_mySeries
+    };
+    
+    // 使用刚指定的配置项和数据显示图表。
+    myChart.setOption(option);
+    window.onresize = function(){
+    	myChart.resize();
+    }
+
+    //将图形对象存进数组，myLineChartArr 是全局变量
+    myLineChartArr.push(myChart);
+
+}
+
+
+		//根据设置的图形属性，请求刷新图形
+		function req_refresh_chart(choosed_flightCsv_Id,returnDataJson){
+			
+			//ajax---------------------
+			oDateAlert('正在处理中，请稍后...');
+			show_zhezhao_mask();//显示遮罩层
+		
+			//注销之前的图形缓存，1个以上的图表	
+			disposeHistoryChatObjArr();
+			
+			var chartData = {};
+			chartData = returnDataJson;
+			if(chartData=={}||chartData=="{}"||chartData==undefined){
+				oDateAlert('该csv文件数据为空，请另选csv文件');
+				console.log('该csv文件数据为空，请另选csv文件');
+				return;
+			}
+
+			//选择的图表列名
+			var clicked_columnNamesArr = chartData.clicked_columnNamesArr;
+			
+			//选择的字符串列名
+			var clicked_string_columnNamesArr = chartData.clicked_string_columnNamesArr;
+			//该列行数
+			var countArr = chartData.chartXData;
+	
+			//新的数据集，多csv文件的//新的数据集，多csv文件的
+			var col_chartYDataEachColumnsNameJsonAll = chartData.col_chartYDataEachColumnsNameJsonAll;
+			//所有点过的列数据,显示用
+			var chartDataSets = [];
+			//画图中的series参数
+			var mySeries = [];
+			//
+			var allYAxis_scale = [];
+			//图形属性信息-开始-------------------------------------------------------------
+			myChartPropertySettingJson_New = {};
+			myChartPropertySettingJson_New = getMyChartPropertySetting(myInfoChartpropertysettingJson);
+			//图形属性信息-结束-------------------------------------------------------------
+			if(clicked_columnNamesArr!=null&&clicked_columnNamesArr.length>0){						
+				var columnsNameStrArr = [];
+				columnsNameStrArr = clicked_columnNamesArr;
+				var columnsNameStrArrSize = clicked_columnNamesArr.length;
+				
+				for(var j=0;j<columnsNameStrArrSize;j++){   //遍历每个参数
+					//参数名
+					columnsNameStrArr_j = '';
+					columnsNameStrArr_j = columnsNameStrArr[j];
+					
+					//var col_chartYData = clicked_chartYData[j].colData;					
+					for(var csv_j=0;csv_j<col_chartYDataEachColumnsNameJsonAll.length;csv_j++){   //遍历csv中参数数据
+						//j 代表一个参数序号，而不是一个csv中的参数序号，如果有返回多个csv文件数据，不要这样做---------------------------
+						//
+						var col_chartYDataEachColumnsNameJson = {};						
+						col_chartYDataEachColumnsNameJson = col_chartYDataEachColumnsNameJsonAll[csv_j];
+						if(col_chartYDataEachColumnsNameJson.columnName==columnsNameStrArr_j){    //如果有相同的参数，则进入
+							col_chartYDataEachColumnsNameJsonArr = [];
+							col_chartYDataEachColumnsNameJsonArr = col_chartYDataEachColumnsNameJson.col_chartYDataEachColumnsNameJsonArr;
+							//新的数据集，多csv文件的，一个csv文件的参数,多个同名参数数据
+							for(var param_i=0;param_i<col_chartYDataEachColumnsNameJsonArr.length;param_i++){
+								//新的数据集，多csv文件的，一个csv文件的参数,一个参数数据
+								col_chartYDataEachCsv = {};
+								col_chartYDataEachCsv = col_chartYDataEachColumnsNameJsonArr[param_i];
+								col_chartYDataEachCsv_colName = '';
+								col_chartYDataEachCsv_colData = [];
+								col_chartYDataEachCsv_colName = col_chartYDataEachCsv.colName;
+								col_chartYDataEachCsv_colData = col_chartYDataEachCsv.colData;
+								
+								//获取该参数的曲线的属性----------------------------------------------
+								var thisParam_linePropertyJson = get_thisParam_lineProperty(columnsNameStrArr_j);
+								var thisParam_lineWidth = '1';
+								var thisParam_lineColor = '#000';
+								if(thisParam_linePropertyJson=={}||thisParam_linePropertyJson=='{}'||thisParam_linePropertyJson==undefined||thisParam_linePropertyJson==''){
+									//获取该参数的曲线的属性----------------------------------------------
+									mySeries_data_i = {"name":col_chartYDataEachCsv_colName,"type":"line","data":col_chartYDataEachCsv_colData,"yAxisIndex":j,"lineStyle":{"width":1}};
+								}else{
+									if(thisParam_linePropertyJson.chartlinewidth!=''&&thisParam_linePropertyJson.chartlinewidth!=undefined){
+										thisParam_lineWidth = thisParam_linePropertyJson.chartlinewidth;
+									}
+									if(thisParam_linePropertyJson.leftChartlinecolor!=''&&thisParam_linePropertyJson.leftChartlinecolor!=undefined){
+										thisParam_lineColor = thisParam_linePropertyJson.leftChartlinecolor;
+									}
+									
+									mySeries_data_i = {"name":col_chartYDataEachCsv_colName,"type":"line","data":col_chartYDataEachCsv_colData,"yAxisIndex":j,"lineStyle":{"width":parseInt(thisParam_lineWidth),"color":thisParam_lineColor}};//j 代表一个参数序号，而不是一个csv中的参数序号，如果有返回多个csv文件数据，不要这样做
+									//mySeries_data_i = {"name":col_chartYDataEachCsv_colName,"type":"line","data":col_chartYDataEachCsv_colData,"yAxisIndex":j,"lineStyle":{"width":1}};
+								}
+								
+								
+								mySeries.push(mySeries_data_i);
+								createOneyAxis_scale_position = '';
+								//j 代表一个参数序号，而不是一个csv中的参数序号，如果有返回多个csv文件数据，不要这样做---------------------------
+								if(j%2==0){
+									createOneyAxis_scale_position = 'left';
+								}else{
+									createOneyAxis_scale_position = 'right';
+								}
+								//j 代表一个参数序号，而不是一个csv中的参数序号，如果有返回多个csv文件数据，不要这样做---------------------------
+								//每个参数的y轴
+								allYAxis_scale.push(createOneyAxis_scale(col_chartYDataEachCsv_colName,createOneyAxis_scale_position,j));//j 代表一个参数序号，而不是一个csv中的参数序号，如果有返回多个csv文件数据，不要这样做
+							}
+						}
+						
+					}
+				
+				}
+				//Echarts 绘图
+				echart_mychart(countArr,mySeries,clicked_columnNamesArr,allYAxis_scale,myChartPropertySettingJson_New);	
+			}
+			
+			hide_zhezhao_mask();//关闭遮罩层
+
+			//将字符串数据显示在表格
+			var clicked_stringData = [];
+			clicked_stringData = chartData.clicked_stringData;
+			loadAll(clicked_string_columnNamesArr, clicked_stringData);
+			if(clicked_stringData.length>0&&(clicked_columnNamesArr.length<clicked_string_columnNamesArr.length)){						
+				oDateAlert('所选参数含有不可数值化的值,请查看表格！');
+			}
+
+			
+		}
+		
+		//创建一个y轴刻度
+		function createOneyAxis_scale(colName,createOneyAxis_scale_position,j){
+			offset_size = 0;
+			if(j%2==0){
+				offset_size = 0-(j/2)*60;
+			}else{
+				offset_size = 0-((j-1)/2)*60;
+			}
+			if(j>6){
+				oDateAlert('图形中参数比较多，请减少勾选的参数，以便更好的观察！');
+			}
+			oneyAxis_scale = {};
+			oneyAxis_scale = {
+                boundaryGap: [0, '50%'],
+                axisLine: {
+                    lineStyle: {
+                        color: '#000'
+                    }
+                },
+                type: 'value',
+                name: colName,
+                position: createOneyAxis_scale_position,
+                offset: offset_size,
+                splitNumber: 10,
+                /*axisLabel: {
+                    formatter: '{value}',
+                    textStyle: {
+                        color: '#FFFFFF'
+                    }
+                },*/
+                splitLine: {
+                    show: false
+                }
+            }
+			return oneyAxis_scale;
+		}
+		
+		//点击曲线上面的点，弹出曲线设置弹出框
+		myChart.on('click', function (params) {
+			if (params.componentType === 'series'){
+				//点击曲线事件标记
+				//clickLineEventFlag = 1;
+				openChartPropertySettingDlgByClickLine(params.seriesName);
+			    // 在控制台中打印
+			    console.log('点击曲线图例' + params.name+'点击的参数：'+params.seriesName);
+			}
+			
+
+		});
+		
+		//打开模态框
+			function openChartPropertySettingDlgByClickLine(clicked_params_seriesName){
+				//打开模态框
+				$('#chartPropertySettingModal_byClickLineEvent').modal();
+				
+				//更新弹出框标题----------------------------------------
+				$(".choosed_paramName_byClickLineEvent").empty();
+				$(".choosed_paramName_byClickLineEvent").append(clicked_params_seriesName);
+				//更新弹出框标题----------------------------------------
+				
+				//更新参数名输入框-----------------------------------------
+
+				//选择的图表列名
+				$("#choosed_paramNameInput").val('');
+				$("#choosed_paramNameInput").val(clicked_params_seriesName);
+				//更新参数名输入框------------------------------------------
+				
+				var lastParampropertysettingJsonTemp={};
+				lastParampropertysettingJsonTemp = get_thisParam_lineProperty(clicked_params_seriesName);
+
+				if(chartPropertySetting_saveSetFlag=='1'||chartPropertySetting_saveSetFlag==1){
+					$.ajax({
+						type: "POST",
+						url: myChartApi_locate_url+'/csvmanager/infoChartpropertysetting/getChartPropertySetting',
+				    	data: {},
+						dataType:'json',
+						cache: false,
+						success: function(data){
+							if(data.status=='1001'||data.status==1001){
+								paramLinepropertyJsonarrFromDB = data.data;
+								//自定设置之前设置过的颜色	
+								$("#left_chartLineColor_byClickLineEvent").attr("hx", lastParampropertysettingJsonTemp.leftChartlinecolor);
+								$('#left_chartLineColor_byClickLineEvent').iColor(function(hx) {				
+						    		this.val('').css('background', '#' + hx);
+						    		left_chartLineColor = '#' + hx;
+						    	});
+								$(".propertyIsSavedTip").empty();
+								if(lastParampropertysettingJsonTemp==''||lastParampropertysettingJsonTemp==undefined){
+									
+									$(".propertyIsSavedTip").append('(该参数图形没有设置过属性)');
+								}
+								$("#chartLineWidth_byClickLineEvent").empty();      //清空	
+								$("#chartLineWidth_byClickLineEvent").select2("val", "");								
+								//线条粗细显示
+								chartLineWidth_prepend = '';
+								chartLineWidth_options = '';
+								
+								for(var i=0;i<chartLineWidthTemplate.length;i++){
+									chartLineWidthTemplate_i = chartLineWidthTemplate[i];
+									if(lastParampropertysettingJsonTemp.chartLineWidth==chartLineWidthTemplate_i.widthIndex){
+										var option="<option value=\""+chartLineWidthTemplate_i.widthIndex+"\""; 
+					                    option += ">"+chartLineWidthTemplate_i.widthNum+"</option>";
+										chartLineWidth_prepend = option;
+										continue;
+									}
+									var option="<option value=\""+chartLineWidthTemplate_i.widthIndex+"\""; 
+				                    option += ">"+chartLineWidthTemplate_i.widthNum+"</option>";
+				                    chartLineWidth_options = chartLineWidth_options+option;
+																
+								}
+								//数据库中有线条粗细匹配						
+								$("#chartLineWidth_byClickLineEvent").append(chartLineWidth_options);	
+								$("#chartLineWidth_byClickLineEvent").prepend(chartLineWidth_prepend);
+								$("#chartLineWidth_byClickLineEvent").val(lastParampropertysettingJsonTemp.chartlinewidth).trigger("change");
+								//左边y轴颜色显示
+								$("#left_chartLineColor_byClickLineEvent").css({"background":lastParampropertysettingJsonTemp.leftChartlinecolor});				
+							}else{
+								//没有保存数据库，从页面临时变量取
+								//左边y轴颜色显示
+								$("#left_chartLineColor_byClickLineEvent").css({"background":lastParampropertysettingJsonTemp.leftChartlinecolor});
+									
+							}
+						}
+						
+					});
+				}else{
+					
+				}
+		
+			}
+		
+
+		function loadAll(header, response) {
+	  		$("#thead_string_columnsname").empty();
+	  		$("#tbody_string_columnsname").empty();
+	  		if(header.length>0&&response.length>0){
+	  			 currIndex = 0;
+	  			  //header
+	  			  var header_html = '';
+	  			  header_html+='<tr>';
+	  			  header_html+='<th>';
+	  			  header_html+= '序号';
+	  			  header_html+='</th>';
+	  			  for(var j=0;j<header.length;j++){			  
+	  				  header_html+='<th>';
+	  				  header_html+=header[j];
+	  				  header_html+='</th>';			  
+	  			  }
+	  			  header_html+='</tr>';
+	  			  //$("#thead_string_columnsname").empty();  	  		
+	  			  $("#thead_string_columnsname").append(header_html);	
+	  			  //$("#tbody_string_columnsname").empty();
+	  			  
+	  			  var pageSize = 100;
+	  			  //数据分组， 每组100条，
+	  			  var groups = group(response,pageSize);		  
+	  			  for (var i = 0; i < groups.length; i++) {
+	  			    //闭包， 保持i值的正确性
+	  			    window.setTimeout(function () {
+	  			      var group = groups[i];
+	  			      var index = i + 1;
+	  			      return function () {
+	  			        //分批渲染
+	  			        loadPart( group, index, pageSize);
+	  			      }
+	  			    }(), 2);
+	  			    
+	  			 }
+	  		}
+	  		
+		}
+			 
+			//数据分组函数（每组500条）
+			function group(response,pageSize) {
+				//	var data = eval(response.qarData);
+				var data=response;
+				  var result = [];
+				  var groupItem;
+				  for (var i=0;i<data.length;i++) {
+				    if (i % pageSize == 0) {
+				      groupItem != null && result.push(groupItem);
+				      groupItem = [];
+				    }
+				    groupItem.push(data[i]);
+				  }
+				  result.push(groupItem);				  
+				  return result;
+			}
+			//表格行数分页索引
+			var currIndex = 0;
+			
+			function loadPart(group, index, pageSize) {
+			      var currPageCount = parseInt(pageSize*currIndex);
+				  var html = "";
+				  for (var i = 0; i < group.length; i++) {				 
+					currPageCount+=1;
+					html += "<tr><td class=\"center\" style=\"width: 30px;\">"+currPageCount+"</td>";
+				    var jsonitem = group[i];
+				    var item=jsonitem;
+				    var arr=item.split(",");
+				    for(var j=0;j<arr.length;j++){
+				    	html+="<td>"+arr[j]+"</td>";
+				    }
+				    html+="</tr>";
+				  }
+				  //保证顺序不错乱
+				  while (index-currIndex==1) {
+				    $("#tbody_string_columnsname").append(html);
+				    currIndex = index;
+				  }
+			}
+			
+			
+			//选择文件导出类型，格式
+			function exportFile(){
+				let box2 = document.getElementById('paramExportFileType')
+				box2.style.display = box2.style.display == 'block' ? 'none' : 'block';  
+			}
+			
+			
+			//参数导出
+			function paramExport(choosed_whole_lineId,choosed_columnsNameStr,choosed_versionId, fileType){					
+				console.log('导出的参数有：'+choosed_columnsNameStr);				
+
+				if(choosed_columnsNameStr==''||choosed_columnsNameStr==""||choosed_columnsNameStr==undefined){
+					oDateAlert('请勾选参数');
+					console.log('请勾选参数');				
+					return;
+				}
+				fidChooseRow = '';
+				fidChooseRow = choosed_whole_lineId;
+				console.log('fidChooseRow = ' + fidChooseRow);
+				if(fidChooseRow==''||fidChooseRow==""||fidChooseRow==undefined){
+					oDateAlert('请勾选csv文件');
+					console.log('请勾选csv文件');				
+					return;
+				}
+				var dataZoomArr = [];
+				var dataZoomAxisStartValue=0;
+				var dataZoomAxisEndValue=0;
+				//图形下载是否成功
+				var downloadImgSuccessFlag = false;
+				//图形是否存在
+			    var chartImgIsExistFlag = 0;
+			    //图片名
+			    var chartImgName = 'chartImg_'+fidChooseRow +'_'+new Date().getTime();
+				if(myChart._model!=null&&myChart._model!=undefined&&fileType=='xlsx'){
+					dataZoomArr = myChart._model.option.dataZoom;
+					if(dataZoomArr!=''&&dataZoomArr!=undefined){
+						for(var i=0;i<dataZoomArr.length;i++){
+							if(dataZoomArr[i].type=='slider'&&dataZoomArr[i].xAxisIndex[0]==0){
+								dataZoomAxisStartValue=dataZoomArr[i].startValue;
+								dataZoomAxisEndValue=dataZoomArr[i].endValue;
+								break;
+							}
+						}
+					}
+					if(dataZoomAxisStartValue==undefined){
+						dataZoomAxisStartValue=0;
+					}
+					if(dataZoomAxisEndValue==undefined){
+						oDateAlert('要导出的图形异常，请刷新后再试');
+						console.log('要导出的图形异常，请刷新后再试');				
+						return;
+					}
+					
+				    var picBase64Info = myChart.getDataURL();//获取echarts图的base64编码，为png格式。				    
+				    
+				    if(picBase64Info!=''&&picBase64Info!=undefined){
+				    	chartImgIsExistFlag = 1;
+				    	picBase64Info = picBase64Info.split(',')[1];
+				    	
+				    	$.ajax({
+				    	　　　　type: "post",
+				    	　　　　data: {
+				    	　　　　　　baseImg: picBase64Info,
+				    	      	imgName: chartImgName
+				    	　　　　},
+				    	　　　　url: myChartApi_locate_url+'/csvmanager/showMultiCsv/exportChartImg',
+				    	　　　　async: false,
+				    	　　　　success: function(data) {
+				    			if(data.status==1001||data.status=='1001'){
+				    				console.log('图形图片保存成功');
+				    				downloadImgSuccessFlag = true;
+				    			}else{
+				    				console.log('图形图片保存失败');
+				    			}
+				    	　　　　},
+				    	　　　　error: function(err){
+				    	　　　　　　console.log('图形图片保存失败');
+				    	　　　　　　oDateAlert('图形图片保存失败');
+				    			
+				    	　　　　}
+
+				    	　　});
+
+				    }
+				}
+				
+
+				if((chartImgIsExistFlag==1)&&!downloadImgSuccessFlag){
+					oDateAlert('要导出的图形异常，请刷新后再试');
+					console.log('要导出的图形异常，请刷新后再试,原因：下载图片异常');				
+					return;
+				}
+				oDateAlert('正在准备导出，请稍后...');
+				if(fileType=='xlsx'){
+					export_url = myChartApi_locate_url+"/csvmanager/showMultiCsv/exportSelectRows?columnsNameStr="+choosed_columnsNameStr+"&fid="+fidChooseRow+'&choosed_versionId='+choosed_versionId+'&dataZoomAxisStartValue='+dataZoomAxisStartValue+'&dataZoomAxisEndValue='+dataZoomAxisEndValue+'&chartImgName='+chartImgName+'&chartImgIsExistFlag='+chartImgIsExistFlag+'&fileType='+fileType;					
+				}
+				else if(fileType=='xml'){
+					export_url = myChartApi_locate_url+"/csvmanager/showMultiCsv/exportSelectRows?columnsNameStr="+choosed_columnsNameStr+"&fid="+fidChooseRow+'&choosed_versionId='+choosed_versionId+'&dataZoomAxisStartValue='+dataZoomAxisStartValue+'&dataZoomAxisEndValue='+dataZoomAxisEndValue+'&chartImgName='+chartImgName+'&chartImgIsExistFlag='+chartImgIsExistFlag+'&fileType='+fileType;					
+				}
+				else if(fileType=='txt'){
+					export_url = myChartApi_locate_url+"/csvmanager/showMultiCsv/exportSelectRows?columnsNameStr="+choosed_columnsNameStr+"&fid="+fidChooseRow+'&choosed_versionId='+choosed_versionId+'&dataZoomAxisStartValue='+dataZoomAxisStartValue+'&dataZoomAxisEndValue='+dataZoomAxisEndValue+'&chartImgName='+chartImgName+'&chartImgIsExistFlag='+chartImgIsExistFlag+'&fileType='+fileType;					
+				}else{
+					console.log('文件格式有误！');
+				}
+				//window.open(export_url);
+				window.location.href=export_url;
+			}		
+			
+			
+			
+			//注销之前的图形缓存，1个以上的图表	
+			function disposeHistoryChatObjArr(){
+				//注销之前的图形缓存，1个以上的图表	
+				for(var charti=0;charti<myLineChartArr.length;charti++){
+					//myLineChartArr[charti].dispose();	
+					myLineChartArr[charti].clear(); //清空setOption()
+				}
+			}	
+			
+		//获取该参数的曲线的属性----------------------
+		//获取该参数的曲线的属性的数组，包含多个匹配的参数
+		var thisParam_linePropertyArr = [];
+		function get_thisParam_lineProperty(paramName){
+			//
+			var thisParam_linePropertyJson = {};
+			var isMatchFromDB_flag = false;
+			for(var i=0;i<paramLinepropertyJsonarrFromDB.length;i++){
+				if(paramLinepropertyJsonarrFromDB[i].paramName==paramName){
+					//
+					thisParam_linePropertyJson = paramLinepropertyJsonarrFromDB[i];
+					isMatchFromDB_flag = true;
+				}
+			}
+			var isMatch_flag = false;
+			for(var i=0;i<paramLinepropertyJsonarr.length;i++){
+				if(paramLinepropertyJsonarr[i].paramName==paramName){
+					//
+					thisParam_linePropertyJson = paramLinepropertyJsonarr[i];
+					isMatch_flag = true;
+				}
+			}
+			if(isMatchFromDB_flag||isMatch_flag){
+				thisParam_linePropertyArr.push(thisParam_linePropertyJson);
+			}else{
+				return '';
+			}
+			return thisParam_linePropertyJson;
+		}
+			
+		
+		//默认只有12种颜色设置，如果参数少于12个，则获取参数的序号，将自定义的颜色取代默认的参数颜色，如果参数多于12个，则则增加颜色
+		function get_whole_chartLine_colorArr(yaxis_mySeries,thisParam_linePropertyArr,whole_chartLine_colorArr,whole_chartLine_colorArrDefault){
+			//
+			var isMatch_params_yAxisIndex_Arr = [];
+			
+			for(var yaxis_mySeries_i=0;yaxis_mySeries_i<yaxis_mySeries.length;yaxis_mySeries_i++){
+				//遍历yaxis_mySeries
+				var isMatch_yaxis_mySeries_i_Flag = false;
+				var isMatch_yaxis_mySeries_i_yAxisIndex = 0;
+				var isMatch_yaxis_mySeries_i_color = '';
+				yaxis_mySeries_i_obj = {};
+				yaxis_mySeries_i_obj = yaxis_mySeries[yaxis_mySeries_i];
+				//如果自定义属性的曲线，参数匹配，记录yAxisIndex
+				for(var i=0;i<thisParam_linePropertyArr.length;i++){
+					if(thisParam_linePropertyArr[i].paramName==yaxis_mySeries_i_obj.name){
+						//
+						isMatch_yaxis_mySeries_i_Flag = true;
+						isMatch_yaxis_mySeries_i_yAxisIndex = yaxis_mySeries_i_obj.yAxisIndex;
+						isMatch_yaxis_mySeries_i_color = thisParam_linePropertyArr[i].leftChartlinecolor;
+					}
+				}
+				if(isMatch_yaxis_mySeries_i_Flag){
+					isMatch_params_yAxisIndex_Arr.push({"match_yAxisIndex":isMatch_yaxis_mySeries_i_yAxisIndex,"match_color":isMatch_yaxis_mySeries_i_color});
+				}
+			}
+			//如果有匹配，修改这个参数，这条曲线的颜色
+			for(var i=0;i<isMatch_params_yAxisIndex_Arr.length;i++){
+				isMatch_yaxis_mySeries_i_yAxisIndex = 0;
+				isMatch_yaxis_mySeries_i_yAxisIndex = isMatch_params_yAxisIndex_Arr[i].match_yAxisIndex;
+				//如果大于10，则要减去10
+				if(isMatch_yaxis_mySeries_i_yAxisIndex>10){
+					//循环push 默认的颜色
+					for(var more_i=0;more_i<(isMatch_yaxis_mySeries_i_yAxisIndex-10-1);more_i++){
+						whole_chartLine_colorArr.push(whole_chartLine_colorArrDefault[more_i]);
+					}
+					//然后轮到该匹配的参数时，把自定的颜色push进去
+					whole_chartLine_colorArr.push(isMatch_params_yAxisIndex_Arr[i].match_color);
+				}else{
+					whole_chartLine_colorArr[isMatch_yaxis_mySeries_i_yAxisIndex]=isMatch_params_yAxisIndex_Arr[i].match_color;
+				}	
+			}
+			return whole_chartLine_colorArr;
+		} 
+
+	
+		//
+		//参数属性设置，选择参数
+		$("#choosed_paramNameSelect").change(function(){
+			var choosed_paramNameSelect = $('#choosed_paramNameSelect').val();		
+			var thisParam_linePropertyJson = {};
+			thisParam_linePropertyJson = get_thisParam_lineProperty(choosed_paramNameSelect);
+			if(thisParam_linePropertyJson!={}&&thisParam_linePropertyJson!='{}'&&thisParam_linePropertyJson!=undefined&&thisParam_linePropertyJson!=''){
+				//自动设置之前设置过的线条粗细
+				$("#chartLineWidth").val(thisParam_linePropertyJson.chartlinewidth).trigger("change");
+				//自定设置之前设置过的颜色
+				$("#left_chartLineColor").css({"background":thisParam_linePropertyJson.leftChartlinecolor});	
+				$("#left_chartLineColor").attr("hx", thisParam_linePropertyJson.leftChartlinecolor);
+				$('#left_chartLineColor').iColor(function(hx) {
+		    		this.val('').css('background', '#' + hx);
+		    	});
+			}
+			
+		});
+		

infosouth-admin/src/main/resources/templates/arj21/csvmanager/imexportLog.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('航班信息列表')" />
+    <th:block th:include="include :: header('导入导出日志列表')" />
 </head>
 <body class="gray-bg">
      <div class="container-div">
@@ -10,25 +10,25 @@
                 <form id="formId">
                     <div class="select-list">
                         <ul>
+                            <li>
+                                <p>null：</p>
+                                <input type="text" name="id"/>
+                            </li>
                             <li class="select-time">
                                 <p>航班日期：</p>
                                 <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginFlDate]"/>
                                 <span>-</span>
                                 <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endFlDate]"/>
                             </li>
-                            <li>
-                                <p>航班号：</p>
-                                <input type="text" name="flNo"/>
-                            </li>
                             <li>
                                 <p>飞机号：</p>
                                 <input type="text" name="arn"/>
                             </li>
                             <li>
                                 <p>机型：</p>
-                                <select name="acType" th:with="type=${@dict.getType('')}">
+                                <select name="acType" >
                                     <option value="">所有</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                    <option th:each="actype,status:${acTypeList}" th:text="${actype}" th:value="${actype}"></option>
                                 </select>
                             </li>
                             <li>
@@ -44,24 +44,38 @@
                                 <input type="text" name="airline"/>
                             </li>
                             <li>
-                                <p>资源目录ID：</p>
-                                <input type="text" name="infoResourceId"/>
+                                <p>操作人：</p>
+                                <input type="text" name="operateBy"/>
                             </li>
                             <li class="select-time">
-                                <p>创建时间：</p>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateDate]"/>
+                                <p>操作时间：</p>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginOperateDate]"/>
                                 <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateDate]"/>
-                            </li>
-                            <li class="select-time">
-                                <p>更新时间：</p>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginUpdateDate]"/>
-                                <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endUpdateDate]"/>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endOperateDate]"/>
                             </li>
                             <li>
-                                <p>备注：</p>
-                                <input type="text" name="remarks"/>
+                                <p>ip：</p>
+                                <input type="text" name="hostIp"/>
+                            </li>
+                            <li>
+                                <p>文件大小：</p>
+                                <input type="text" name="fileSize"/>
+                            </li>
+                            <li>
+                                <p>操作类型</p>
+                                <select name="operateType">
+                                    <option value="">所有</option>
+                                    <option value="">导入</option>
+                                    <option value="">导出</option>
+                                </select>
+                            </li>
+                            <li>
+                                <p>是否成功：</p>
+                                <input type="text" name="isSucce"/>
+                            </li>
+                            <li>
+                                <p>失败原因：</p>
+ 								<input type="text" name="failType"/>
                             </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -73,16 +87,16 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="arj21:flight:add">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="arj21:csvmanager/imexportLog:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="arj21:flight:edit">
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="arj21:csvmanager/imexportLog:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="arj21:flight:remove">
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="arj21:csvmanager/imexportLog:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="arj21:flight:export">
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="arj21:csvmanager/imexportLog:export">
                     <i class="fa fa-download"></i> 导出
                  </a>
             </div>
@@ -93,9 +107,9 @@
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('arj21:flight:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('arj21:flight:remove')}]];
-        var prefix = ctx + "arj21/csvmanager";
+        var editFlag = [[${@permission.hasPermi('arj21:csvmanager/imexportLog:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('arj21:csvmanager/imexportLog:remove')}]];
+        var prefix = ctx + "arj21/csvmanager/imexportLog";
 
         $(function() {
             var options = {
@@ -104,15 +118,10 @@
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
-                modalName: "航班信息",
+                modalName: "导入导出日志",
                 columns: [{
                     checkbox: true
                 },
-                {
-                    field : 'id', 
-                    title : 'null',
-                    visible: false
-                },
                 {
                     field : 'flDate', 
                     title : '航班日期'
@@ -150,8 +159,32 @@
                     title : 'csv文件名'
                 },
                 {
-                    field : 'infoResourceId', 
-                    title : '资源目录ID'
+                    field : 'operateBy', 
+                    title : '操作人'
+                },
+                {
+                    field : 'operateDate', 
+                    title : '操作时间'
+                },
+                {
+                    field : 'hostIp', 
+                    title : 'ip'
+                },
+                {
+                    field : 'fileSize', 
+                    title : '文件大小'
+                },
+                {
+                    field : 'operateType', 
+                    title : '操作类型'
+                },
+                {
+                    field : 'isSucce', 
+                    title : '是否成功'
+                },
+                {
+                    field : 'failType', 
+                    title : '失败原因'
                 },
                 {
                     field : 'createDate', 

infosouth-admin/src/main/resources/templates/arj21/csvmanager/log/add.html

@@ -0,0 +1,192 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增导入导出日志')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-csvexport-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">航班日期：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="flDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">航班号：</label>
+                <div class="col-sm-8">
+                    <input name="flNo" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">飞机号：</label>
+                <div class="col-sm-8">
+                    <input name="arn" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">机型：</label>
+                <div class="col-sm-8">
+                    <select name="acType" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">起飞机场：</label>
+                <div class="col-sm-8">
+                    <input name="pod" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">到达机场：</label>
+                <div class="col-sm-8">
+                    <input name="poa" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">所属公司：</label>
+                <div class="col-sm-8">
+                    <input name="airline" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">csv存储路径：</label>
+                <div class="col-sm-8">
+                    <input name="csvPath" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">csv文件名：</label>
+                <div class="col-sm-8">
+                    <textarea name="csvName" class="form-control"></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">操作人：</label>
+                <div class="col-sm-8">
+                    <input name="operateBy" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">操作时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="operateDate" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">ip：</label>
+                <div class="col-sm-8">
+                    <input name="hostIp" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">文件大小：</label>
+                <div class="col-sm-8">
+                    <input name="fileSize" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">操作类型--导入，导出：</label>
+                <div class="col-sm-8">
+                    <select name="operateType" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否成功：</label>
+                <div class="col-sm-8">
+                    <input name="isSucce" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">失败原因：</label>
+                <div class="col-sm-8">
+                    <select name="failType" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">创建时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="createDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">更新时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="updateDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remarks" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">删除标志：</label>
+                <div class="col-sm-8">
+                    <input name="delFlag" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script type="text/javascript">
+        var prefix = ctx + "arj21/csvexport"
+        $("#form-csvexport-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-csvexport-add').serialize());
+            }
+        }
+
+        $("input[name='flDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='operateDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='createDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='updateDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

infosouth-admin/src/main/resources/templates/arj21/csvmanager/log/csvexport.html

@@ -0,0 +1,141 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('导入导出日志列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li class="select-time">
+                                <p>航班日期：</p>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginFlDate]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endFlDate]"/>
+                            </li>
+                            <li>
+                                <p>飞机号：</p>
+                                <input type="text" name="arn"/>
+                            </li>
+                            <li>
+                                <p>机型：</p>
+                                <select name="acType" th:with="type=${@dict.getType('')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <p>操作类型--导入，导出：</p>
+                                <select name="operateType" th:with="type=${@dict.getType('')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="arj21:csvexport:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="arj21:csvexport:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="arj21:csvexport:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="arj21:csvexport:export">
+                    <i class="fa fa-download"></i> 导出
+                 </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('arj21:csvexport:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('arj21:csvexport:remove')}]];
+        var prefix = ctx + "arj21/csvexport";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "导入导出日志",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field : 'flDate', 
+                    title : '航班日期'
+                },
+                {
+                    field : 'arn', 
+                    title : '飞机号'
+                },
+                {
+                    field : 'acType', 
+                    title : '机型'
+                },
+                {
+                    field : 'csvName', 
+                    title : 'csv文件名'
+                },
+                {
+                    field : 'operateBy', 
+                    title : '操作人'
+                },
+                {
+                    field : 'operateDate', 
+                    title : '操作时间'
+                },
+                {
+                    field : 'hostIp', 
+                    title : 'ip'
+                },
+                {
+                    field : 'fileSize', 
+                    title : '文件大小'
+                },
+                {
+                    field : 'operateType', 
+                    title : '操作类型--导入，导出'
+                },
+                {
+                    field : 'isSucce', 
+                    title : '是否成功'
+                },
+                {
+                    field : 'failType', 
+                    title : '失败原因'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

infosouth-admin/src/main/resources/templates/arj21/csvmanager/log/edit.html

@@ -0,0 +1,187 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改导入导出日志')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-csvexport-edit" th:object="${infoImexportLog}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">航班日期：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="flDate" th:value="${#dates.format(infoImexportLog.flDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">航班号：</label>
+                <div class="col-sm-8">
+                    <input name="flNo" th:field="*{flNo}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">飞机号：</label>
+                <div class="col-sm-8">
+                    <input name="arn" th:field="*{arn}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">机型：</label>
+                <div class="col-sm-8">
+                    <select name="acType" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">起飞机场：</label>
+                <div class="col-sm-8">
+                    <input name="pod" th:field="*{pod}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">到达机场：</label>
+                <div class="col-sm-8">
+                    <input name="poa" th:field="*{poa}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">所属公司：</label>
+                <div class="col-sm-8">
+                    <input name="airline" th:field="*{airline}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">csv存储路径：</label>
+                <div class="col-sm-8">
+                    <input name="csvPath" th:field="*{csvPath}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">csv文件名：</label>
+                <div class="col-sm-8">
+                    <textarea name="csvName" class="form-control">[[*{csvName}]]</textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">操作人：</label>
+                <div class="col-sm-8">
+                    <input name="operateBy" th:field="*{operateBy}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">操作时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="operateDate" th:value="${#dates.format(infoImexportLog.operateDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">ip：</label>
+                <div class="col-sm-8">
+                    <input name="hostIp" th:field="*{hostIp}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">文件大小：</label>
+                <div class="col-sm-8">
+                    <input name="fileSize" th:field="*{fileSize}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">操作类型--导入，导出：</label>
+                <div class="col-sm-8">
+                    <select name="operateType" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否成功：</label>
+                <div class="col-sm-8">
+                    <input name="isSucce" th:field="*{isSucce}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">失败原因：</label>
+                <div class="col-sm-8">
+                    <select name="failType" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">创建时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="createDate" th:value="${#dates.format(infoImexportLog.createDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">更新时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="updateDate" th:value="${#dates.format(infoImexportLog.updateDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remarks" th:field="*{remarks}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script type="text/javascript">
+        var prefix = ctx + "arj21/csvexport";
+        $("#form-csvexport-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-csvexport-edit').serialize());
+            }
+        }
+
+        $("input[name='flDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='operateDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='createDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='updateDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

infosouth-admin/src/main/resources/templates/arj21/csvmanager/qarDataExport.html

@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('航班信息列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li class="select-time">
+                                <p>航班日期：</p>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginFlDate]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endFlDate]"/>
+                            </li>
+                            <li>
+                                <p>机型：</p>
+                                <select name="acType" >
+                                    <option value="">所有</option>
+                                    <option th:each="actype,status:${acTypeList}" th:text="${actype}" th:value="${actype}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <p>飞机号：</p>
+                                <input type="text" name="arn"/>
+                            </li>
+                            <li>
+                                <p>起飞机场：</p>
+                                <input type="text" name="pod"/>
+                            </li>
+                            <li>
+                                <p>落地机场：</p>
+                                <input type="text" name="poa"/>
+                            </li>
+                            
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                           <!--  <li>
+                            	<p>导出类型：</p>
+                            	 <select name="exportType" >
+                                    <option value="csv">csv</option>
+                                    <option value="xml">xml</option>
+                                    <option value="txt">txt</option>
+                                 </select>
+                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;</a>
+                            </li> -->
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="arj21:flight:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="arj21:flight:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="arj21:flight:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="arj21:flight:export">
+                    <i class="fa fa-download"></i> 导出
+                 </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('arj21:flight:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('arj21:flight:remove')}]];
+        var prefix = ctx + "arj21/csvmanager";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "航班信息",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field : 'id', 
+                    title : 'null',
+                    visible: false
+                },
+                {
+                    field : 'csvName', 
+                    title : 'csv文件名'
+                },
+                {
+                    field : 'arn', 
+                    title : '飞机号'
+                },
+                {
+                    field : 'acType', 
+                    title : '机型'
+                },
+                {
+                    field : 'flDate', 
+                    title : '航班日期'
+                },
+                {
+                    field : 'pod', 
+                    title : '起飞机场'
+                },
+                {
+                    field : 'poa', 
+                    title : '到达机场'
+                },
+                {
+                    field : 'createDate', 
+                    title : '导入时间'
+                }
+               
+               /*  {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                } */
+                ]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

infosouth-admin/src/main/resources/templates/arj21/csvmanager/qarDataImport.html

@@ -5,7 +5,6 @@
 	<th:block th:include="include :: datetimepicker-css" />
 	<title>csv管理</title>
 	<meta name="decorator" content="default"/>
-	<link href="/bootstrap/3.3.7/css/bootstrap.min.css"   rel="stylesheet">
 	
 	<style>
 		.myTable{
@@ -45,7 +44,7 @@
     var fc = 0;
     // 原来的 "^[A-Za-z]-([0-9]{4})_([0-9]{14})_([0-9]+).csv$"
     var reg = "^[A-Z]-([A-Z0-9]{4})_([0-9]{14})(.*?).csv$";//验证文件名格式正则        如： B-3251_20171115045933_479365185.csv
-    var base = "${ctx}/csvmanager/infoFlight";
+    var base = "/arj21/csvmanager/qarDataImport";
     var tbody_html = "";
     var allSuccess = true;//所有上传任务都成功
 		$(document).ready(function() {
@@ -102,7 +101,8 @@
 	    			$("#progressBar").append("<li style='list-style-type:none;'><span class='filename'>"+efileName+"</span><div class='progress'> <div id='"+m+"barj' class='progress-bar progress-bar-info' role='progressbar' aria-valuemin='0' aria-valuenow='0' aria-valuemax='100' style='width: 0%'></div></div></li>");
 	    		} */
 	    		//填充table
-	    		tbody_html = "";
+	    		tbody_html = ""
+	    		var loginName = "";//上传用户名
 	    		for(var m=0;m<ss.length;m++){ //循环添加进度条	    			
 	    			efileName = ss[m].name ;
 	    			var efileNameArr = efileName.split('_');
@@ -126,7 +126,7 @@
 					//机型
 					$.ajax({
 	    				type: "POST",
-	    				url: '${ctx}/csvmanager/infoFlight/getAcTypeByArn',
+	    				url: '/arj21/csvmanager/getAcTypeByArn',
 	    		    	data: {arn:airNo},
 	    				dataType:'json',
 	    				cache: false,
@@ -134,6 +134,7 @@
 	    				success: function(data){
 	    					if(data.status=='1001'){
 	    						tbody_html +=''+data.data;
+	    						loginName = data.loginName;
 	    					}else{
 	    						alert('上传出错，请稍后再试！')
 	    						return;
@@ -165,7 +166,7 @@
 	    			tbody_html += "</td>";
 	    			tbody_html += "<td>";
 					//上传人
-					tbody_html +='<%=UserUtils.getUser().getName()%>';
+					tbody_html += loginName;
 	    			tbody_html += "</td>";
 	    			tbody_html += "<td class=\"td_time_"+m+"\">";
 					//上传时间
@@ -253,6 +254,7 @@
 			        //xhr.upload.addEventListener("progress", progressFunction, false);
 			        xhr.send(form);   
 		    }
+		    
 		    function progressFunction(evt) {
 		        var progressBar = $("#progressBar").find("#"+j+"barj");
 		        if (evt.lengthComputable) {

infosouth-admin/src/main/resources/templates/arj21/duty_schedule/add.html

@@ -0,0 +1,182 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增任务调度')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-duty_schedule-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">null：</label>
+                <div class="col-sm-8">
+                    <input name="id" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">任务名称：</label>
+                <div class="col-sm-8">
+                    <input name="jobName" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">模型名称，多个用;分割：</label>
+                <div class="col-sm-8">
+                    <textarea name="modelName" class="form-control" required></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">机型，多个用;分割，为空表示不设限制：</label>
+                <div class="col-sm-8">
+                    <select name="acType" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">飞机号，多个用;分割，为空表示不设限制：</label>
+                <div class="col-sm-8">
+                    <textarea name="acReg" class="form-control"></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">对应版本：</label>
+                <div class="col-sm-8">
+                    <input name="versionId" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">开始日期，为空表示不设限制：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="startDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">结束日期，为空表示不设限制：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="endDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">任务描述：</label>
+                <div class="col-sm-8">
+                    <input name="jobDesc" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">具体任务的执行状态：</label>
+                <div class="col-sm-8">
+                    <input name="isExcute" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">任务状态，正常/异常/：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box">
+                        <input type="radio" name="jobStatus" value="">
+                        <label th:for="jobStatus" th:text="未知"></label>
+                    </div>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">执行周期：</label>
+                <div class="col-sm-8">
+                    <textarea name="excuteFreq" class="form-control"></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">创建时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="createDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">更新时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="updateDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remarks" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">删除标志：</label>
+                <div class="col-sm-8">
+                    <input name="delFlag" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">job配置id：</label>
+                <div class="col-sm-8">
+                    <input name="jobConf" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">程序执行状态,-2,定时器停止；-1，定时器执行；：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box">
+                        <input type="radio" name="executeStatus" value="">
+                        <label th:for="executeStatus" th:text="未知"></label>
+                    </div>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script type="text/javascript">
+        var prefix = ctx + "arj21/duty_schedule"
+        $("#form-duty_schedule-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-duty_schedule-add').serialize());
+            }
+        }
+
+        $("input[name='startDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='endDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='createDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='updateDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

infosouth-admin/src/main/resources/templates/arj21/duty_schedule/duty_schedule.html

@@ -0,0 +1,176 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('任务调度列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <p>任务名称：</p>
+                                <input type="text" name="jobName"/>
+                            </li>
+                            <li>
+                                <p>机型，多个用;分割，为空表示不设限制：</p>
+                                <select name="acType" th:with="type=${@dict.getType('')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <p>对应版本：</p>
+                                <input type="text" name="versionId"/>
+                            </li>
+                            <li class="select-time">
+                                <p>开始日期，为空表示不设限制：</p>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginStartDate]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endStartDate]"/>
+                            </li>
+                            <li class="select-time">
+                                <p>结束日期，为空表示不设限制：</p>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginEndDate]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endEndDate]"/>
+                            </li>
+                            <li>
+                                <p>任务描述：</p>
+                                <input type="text" name="jobDesc"/>
+                            </li>
+                            <li>
+                                <p>具体任务的执行状态：</p>
+                                <input type="text" name="isExcute"/>
+                            </li>
+                            <li>
+                                <p>任务状态，正常/异常/：</p>
+                                <select name="jobStatus">
+                                    <option value="">所有</option>
+                                </select>
+                            </li>
+                            <li class="select-time">
+                                <p>创建时间：</p>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateDate]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateDate]"/>
+                            </li>
+                            <li class="select-time">
+                                <p>更新时间：</p>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginUpdateDate]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endUpdateDate]"/>
+                            </li>
+                            <li>
+                                <p>备注：</p>
+                                <input type="text" name="remarks"/>
+                            </li>
+                            <li>
+                                <p>job配置id：</p>
+                                <input type="text" name="jobConf"/>
+                            </li>
+                            <li>
+                                <p>程序执行状态,-2,定时器停止；-1，定时器执行；：</p>
+                                <select name="executeStatus">
+                                    <option value="">所有</option>
+                                </select>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="arj21:duty_schedule:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="arj21:duty_schedule:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="arj21:duty_schedule:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="arj21:duty_schedule:export">
+                    <i class="fa fa-download"></i> 导出
+                 </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('arj21:duty_schedule:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('arj21:duty_schedule:remove')}]];
+        var prefix = ctx + "arj21/duty_schedule";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "任务调度",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field : 'id', 
+                    title : 'null'
+                },
+                {
+                    field : 'jobName', 
+                    title : '任务名称'
+                },
+                {
+                    field : 'acType', 
+                    title : '机型，多个用;分割，为空表示不设限制'
+                },
+                {
+                    field : 'jobDesc', 
+                    title : '任务描述'
+                },
+                {
+                    field : 'isExcute', 
+                    title : '具体任务的执行状态'
+                },
+                {
+                    field : 'jobStatus', 
+                    title : '任务状态，正常/异常/'
+                },
+                {
+                    field : 'createBy', 
+                    title : '创建者'
+                },
+                {
+                    field : 'createDate', 
+                    title : '创建时间'
+                },
+                {
+                    field : 'updateDate', 
+                    title : '更新时间'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

infosouth-admin/src/main/resources/templates/arj21/duty_schedule/edit.html

@@ -0,0 +1,171 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改任务调度')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-duty_schedule-edit" th:object="${infoDutySchedule}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">任务名称：</label>
+                <div class="col-sm-8">
+                    <input name="jobName" th:field="*{jobName}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">模型名称，多个用;分割：</label>
+                <div class="col-sm-8">
+                    <textarea name="modelName" class="form-control" required>[[*{modelName}]]</textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">机型，多个用;分割，为空表示不设限制：</label>
+                <div class="col-sm-8">
+                    <select name="acType" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">飞机号，多个用;分割，为空表示不设限制：</label>
+                <div class="col-sm-8">
+                    <textarea name="acReg" class="form-control">[[*{acReg}]]</textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">对应版本：</label>
+                <div class="col-sm-8">
+                    <input name="versionId" th:field="*{versionId}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">开始日期，为空表示不设限制：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="startDate" th:value="${#dates.format(infoDutySchedule.startDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">结束日期，为空表示不设限制：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="endDate" th:value="${#dates.format(infoDutySchedule.endDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">任务描述：</label>
+                <div class="col-sm-8">
+                    <input name="jobDesc" th:field="*{jobDesc}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">具体任务的执行状态：</label>
+                <div class="col-sm-8">
+                    <input name="isExcute" th:field="*{isExcute}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">任务状态，正常/异常/：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box">
+                        <input type="radio" name="jobStatus" value="">
+                        <label th:for="jobStatus" th:text="未知"></label>
+                    </div>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">执行周期：</label>
+                <div class="col-sm-8">
+                    <textarea name="excuteFreq" class="form-control">[[*{excuteFreq}]]</textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">创建时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="createDate" th:value="${#dates.format(infoDutySchedule.createDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">更新时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="updateDate" th:value="${#dates.format(infoDutySchedule.updateDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remarks" th:field="*{remarks}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">job配置id：</label>
+                <div class="col-sm-8">
+                    <input name="jobConf" th:field="*{jobConf}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">程序执行状态,-2,定时器停止；-1，定时器执行；：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box">
+                        <input type="radio" name="executeStatus" value="">
+                        <label th:for="executeStatus" th:text="未知"></label>
+                    </div>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script type="text/javascript">
+        var prefix = ctx + "arj21/duty_schedule";
+        $("#form-duty_schedule-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-duty_schedule-edit').serialize());
+            }
+        }
+
+        $("input[name='startDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='endDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='createDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='updateDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

infosouth-admin/src/main/resources/templates/arj21/parameter_computed/add.html

@@ -0,0 +1,153 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增计算参数')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-parameter_computed-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">参数主表id：</label>
+                <div class="col-sm-8">
+                    <input name="prmId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">版本id：</label>
+                <div class="col-sm-8">
+                    <select name="infoVersion" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">类型：1:参数,2:平滑处理,(通用方法)3:模型：</label>
+                <div class="col-sm-8">
+                    <select name="infoType" class="form-control m-b" required>
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">参数名：</label>
+                <div class="col-sm-8">
+                    <input name="prmName" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">参数描述：</label>
+                <div class="col-sm-8">
+                    <textarea name="prmDesc" class="form-control"></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">null：</label>
+                <div class="col-sm-8">
+                    <input name="prmLanguage" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">脚本代码：</label>
+                <div class="col-sm-8">
+                    <input name="scriptCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">脚本代码(python)：</label>
+                <div class="col-sm-8">
+                    <input name="pythonCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">编译顺序：</label>
+                <div class="col-sm-8">
+                    <input name="order" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">引用的参数：</label>
+                <div class="col-sm-8">
+                    <input name="preferenceParams" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">模型需要导出的参数：</label>
+                <div class="col-sm-8">
+                    <input name="exportParams" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">导出数据起始点：</label>
+                <div class="col-sm-8">
+                    <input name="exportFrom" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">导出数据结束点：</label>
+                <div class="col-sm-8">
+                    <input name="exportTo" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">创建时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="createDate" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">更新时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="updateDate" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remarks" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">删除标志：</label>
+                <div class="col-sm-8">
+                    <input name="delFlag" class="form-control" type="text" required>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script type="text/javascript">
+        var prefix = ctx + "arj21/parameter_computed"
+        $("#form-parameter_computed-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-parameter_computed-add').serialize());
+            }
+        }
+
+        $("input[name='createDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='updateDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

infosouth-admin/src/main/resources/templates/arj21/parameter_computed/edit.html

@@ -0,0 +1,148 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改计算参数')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-parameter_computed-edit" th:object="${infoParameterComputed}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">参数主表id：</label>
+                <div class="col-sm-8">
+                    <input name="prmId" th:field="*{prmId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">版本id：</label>
+                <div class="col-sm-8">
+                    <select name="infoVersion" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">类型：1:参数,2:平滑处理,(通用方法)3:模型：</label>
+                <div class="col-sm-8">
+                    <select name="infoType" class="form-control m-b" required>
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">参数名：</label>
+                <div class="col-sm-8">
+                    <input name="prmName" th:field="*{prmName}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">参数描述：</label>
+                <div class="col-sm-8">
+                    <textarea name="prmDesc" class="form-control">[[*{prmDesc}]]</textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">null：</label>
+                <div class="col-sm-8">
+                    <input name="prmLanguage" th:field="*{prmLanguage}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">脚本代码：</label>
+                <div class="col-sm-8">
+                    <input name="scriptCode" th:field="*{scriptCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">脚本代码(python)：</label>
+                <div class="col-sm-8">
+                    <input name="pythonCode" th:field="*{pythonCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">编译顺序：</label>
+                <div class="col-sm-8">
+                    <input name="order" th:field="*{order}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">引用的参数：</label>
+                <div class="col-sm-8">
+                    <input name="preferenceParams" th:field="*{preferenceParams}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">模型需要导出的参数：</label>
+                <div class="col-sm-8">
+                    <input name="exportParams" th:field="*{exportParams}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">导出数据起始点：</label>
+                <div class="col-sm-8">
+                    <input name="exportFrom" th:field="*{exportFrom}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">导出数据结束点：</label>
+                <div class="col-sm-8">
+                    <input name="exportTo" th:field="*{exportTo}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">创建时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="createDate" th:value="${#dates.format(infoParameterComputed.createDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">更新时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="updateDate" th:value="${#dates.format(infoParameterComputed.updateDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remarks" th:field="*{remarks}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script type="text/javascript">
+        var prefix = ctx + "arj21/parameter_computed";
+        $("#form-parameter_computed-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-parameter_computed-edit').serialize());
+            }
+        }
+
+        $("input[name='createDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='updateDate']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

infosouth-admin/src/main/resources/templates/arj21/parameter_computed/parameter_computed.html

@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('计算参数列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <p>版本id：</p>
+                                <select name="infoVersion" th:with="type=${@dict.getType('')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <p>参数名：</p>
+                                <input type="text" name="prmName"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="arj21:parameter_computed:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="arj21:parameter_computed:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="arj21:parameter_computed:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="arj21:parameter_computed:export">
+                    <i class="fa fa-download"></i> 导出
+                 </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('arj21:parameter_computed:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('arj21:parameter_computed:remove')}]];
+        var prefix = ctx + "arj21/parameter_computed";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "计算参数",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field : 'id', 
+                    title : 'null',
+                    visible: false
+                },
+                {
+                    field : 'infoVersion', 
+                    title : '版本id'
+                },
+                {
+                    field : 'prmName', 
+                    title : '参数名'
+                },
+                {
+                    field : 'prmDesc', 
+                    title : '参数描述'
+                },
+                {
+                    field : 'order', 
+                    title : '编译顺序'
+                },
+                {
+                    field : 'updateDate', 
+                    title : '更新时间'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

infosouth-admin/src/main/resources/templates/arj21/resource-manage/edit.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
-    <th:block th:include="include :: header('修改资源目录')" />
+    <th:block th:include="include :: header('淇敼璧勬簮鐩綍')" />
     <th:block th:include="include :: datetimepicker-css" />
 </head>
 <body class="white-bg">
@@ -9,7 +9,7 @@
         <form class="form-horizontal m" id="form-resource-edit" th:object="${infoResource}">
             <input name="id" th:field="*{id}" type="hidden">
             <div class="form-group">    
-                <label class="col-sm-3 control-label">父级编号：</label>
+                <label class="col-sm-3 control-label">鐖剁骇缂栧彿锛<EFBFBD></label>
                 <div class="col-sm-8">
                     <div class="input-group">
                         <input id="treeId" name="parentId" type="hidden" th:field="*{parentId}" />
@@ -19,25 +19,25 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">所有父级编号：</label>
+                <label class="col-sm-3 control-label">鎵<EFBFBD>鏈夌埗绾х紪鍙凤細</label>
                 <div class="col-sm-8">
                     <textarea name="parentIds" class="form-control" required>[[*{parentIds}]]</textarea>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">名称：</label>
+                <label class="col-sm-3 control-label is-required">鍚嶇О锛<EFBFBD></label>
                 <div class="col-sm-8">
                     <input name="name" th:field="*{name}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">排序：</label>
+                <label class="col-sm-3 control-label is-required">鎺掑簭锛<EFBFBD></label>
                 <div class="col-sm-8">
                     <input name="sort" th:field="*{sort}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">创建时间：</label>
+                <label class="col-sm-3 control-label">鍒涘缓鏃堕棿锛<EFBFBD></label>
                 <div class="col-sm-8">
                     <div class="input-group date">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
@@ -46,7 +46,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">更新时间：</label>
+                <label class="col-sm-3 control-label">鏇存柊鏃堕棿锛<EFBFBD></label>
                 <div class="col-sm-8">
                     <div class="input-group date">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
@@ -55,67 +55,67 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">备注信息：</label>
+                <label class="col-sm-3 control-label is-required">澶囨敞淇℃伅锛<EFBFBD></label>
                 <div class="col-sm-8">
                     <input name="remarks" th:field="*{remarks}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">是否为目录：</label>
+                <label class="col-sm-3 control-label is-required">鏄惁涓虹洰褰曪細</label>
                 <div class="col-sm-8">
                     <input name="isDir" th:field="*{isDir}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">英文名：</label>
+                <label class="col-sm-3 control-label">鑻辨枃鍚嶏細</label>
                 <div class="col-sm-8">
                     <input name="enName" th:field="*{enName}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">所属用户ID：</label>
+                <label class="col-sm-3 control-label">鎵<EFBFBD>灞炵敤鎴稩D锛<EFBFBD></label>
                 <div class="col-sm-8">
                     <input name="ownerId" th:field="*{ownerId}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">用户组ID：</label>
+                <label class="col-sm-3 control-label">鐢ㄦ埛缁処D锛<EFBFBD></label>
                 <div class="col-sm-8">
                     <input name="ownerGrpId" th:field="*{ownerGrpId}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">6可读可写：</label>
+                <label class="col-sm-3 control-label is-required">6鍙鍙啓锛<EFBFBD></label>
                 <div class="col-sm-8">
                     <input name="authLevelOwner" th:field="*{authLevelOwner}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">同组者权限(默认有可读权限)：</label>
+                <label class="col-sm-3 control-label is-required">鍚岀粍鑰呮潈闄<EFBFBD>(榛樿鏈夊彲璇绘潈闄<E6BD88>)锛<></label>
                 <div class="col-sm-8">
                     <input name="authLevelSameGrp" th:field="*{authLevelSameGrp}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">其他用户权限：</label>
+                <label class="col-sm-3 control-label is-required">鍏朵粬鐢ㄦ埛鏉冮檺锛<EFBFBD></label>
                 <div class="col-sm-8">
                     <input name="authLevelOther" th:field="*{authLevelOther}" class="form-control" type="text" required>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">免密公钥列表(user_id1@auth_level1;user_id2@auth_level2)：</label>
+                <label class="col-sm-3 control-label">鍏嶅瘑鍏挜鍒楄〃(user_id1@auth_level1;user_id2@auth_level2)锛<></label>
                 <div class="col-sm-8">
                     <input name="authKey" th:field="*{authKey}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">hdfs映射路径：</label>
+                <label class="col-sm-3 control-label">hdfs鏄犲皠璺緞锛<EFBFBD></label>
                 <div class="col-sm-8">
                     <input name="mappingPath" th:field="*{mappingPath}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">检查是否同步的时间：</label>
+                <label class="col-sm-3 control-label">妫<EFBFBD>鏌ユ槸鍚﹀悓姝ョ殑鏃堕棿锛<EFBFBD></label>
                 <div class="col-sm-8">
                     <div class="input-group date">
                         <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
@@ -124,7 +124,7 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">资源路径是否有效(-1, 0, 1),0代表未知,-1代表无效，1代表有效：</label>
+                <label class="col-sm-3 control-label is-required">璧勬簮璺緞鏄惁鏈夋晥(-1, 0, 1),0浠ｈ〃鏈煡,-1浠ｈ〃鏃犳晥锛<E699A5>1浠ｈ〃鏈夋晥锛<E699A5></label>
                 <div class="col-sm-8">
                     <input name="checkValid" th:field="*{checkValid}" class="form-control" type="text" required>
                 </div>
@@ -163,10 +163,10 @@
             autoclose: true
         });
 
-        /*资源目录-新增-选择父部门树*/
+        /*璧勬簮鐩綍-鏂板-閫夋嫨鐖堕儴闂ㄦ爲*/
         function selectResourceTree() {
             var options = {
-                title: '资源目录选择',
+                title: '璧勬簮鐩綍閫夋嫨',
                 width: "380",
                 url: prefix + "/selectResourceTree/" + $("#treeId").val(),
                 callBack: doSubmit

infosouth-admin/src/main/resources/templates/index.html

@@ -8,8 +8,8 @@
     <!--[if lt IE 9]>
     <meta http-equiv="refresh" content="0;ie.html"/>
     <![endif]-->
-    <link th:href="@{favicon.ico}" rel="stylesheet"/>
-    <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
+<!--     <link th:href="@{favicon.ico}" rel="stylesheet"/>
+ -->    <link th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/jquery.contextMenu.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link th:href="@{/css/animate.css}" rel="stylesheet"/>

infosouth-admin/src/main/resources/templates/main.html

@@ -5,8 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!--360浏览器优先以webkit内核解析-->
     <title>首页数据展示</title>
-    <link rel="shortcut icon" href="favicon.ico">
-	<title>[[${sysName}]]</title>
+<!--     <link rel="shortcut icon" href="favicon.ico">
+ -->	<title>[[${sysName}]]</title>
 	<meta name="decorator" content="blank"/>
 	<!-- 静态页面js文件刷新 -->
 	<meta http-equiv="pragma" content="no-cache"/> 
@@ -20,7 +20,7 @@
 	<!-- 引入自己写的css样式文件 -->
 	<link href="../static/oneself/common/main_index.css" th:href="@{/oneself/common/main_index.css}" type="text/css" rel="stylesheet" />
 	<link href="../static/oneself/css/main.css" th:href="@{/oneself/css/main.css}" type="text/css" rel="stylesheet" />
-
+	
 	<style type="text/css">
 		body{
 			overflow:scroll;
@@ -244,8 +244,8 @@
 								<tbody>
 								<tr>
 									<td bgcolor="#F4D371">
-										${acType_row1}
-									</td>
+<!-- 										${acType_row1}
+ -->									</td>
 									<td class="${acType_row1}_param_col1">
 
 									</td>
@@ -261,7 +261,7 @@
 								</tr>
 								<tr>
 									<td bgcolor="#F4D371">
-										${acType_row2}
+										<!-- ${acType_row2} -->
 									</td>
 									<td class="${acType_row2}_param_col1">
 
@@ -278,7 +278,7 @@
 								</tr>
 								<tr>
 									<td bgcolor="#F4D371">
-										${acType_row3}
+										<!-- ${acType_row3} -->
 									</td>
 									<td class="${acType_row3}_param_col1">
 
@@ -296,7 +296,7 @@
 
 								<tr>
 									<td bgcolor="#F4D371">
-										${acType_row4}
+										<!-- ${acType_row4} -->
 									</td>
 									<td class="${acType_row4}_param_col1">
 
@@ -313,7 +313,7 @@
 								</tr>
 								<tr>
 									<td bgcolor="#F4D371">
-										${acType_row5}
+										<!-- ${acType_row5} -->
 									</td>
 									<td class="${acType_row5}_param_col1">
 
@@ -344,8 +344,8 @@
 					</td>
 					<td valign="top" style="background-color: #FFFFFF;" rowspan="3">
 						<div class="biaog03_img main_cell_right">
-							<iframe name="infoDutyScheduleList" class="main_cell_right" id="infoDutyScheduleList" th:src="@{/defaultIndex/defaultIndex/infoDutyScheduleList}" scrolling="no" width="100%" frameborder="0"></iframe>
-						</div>
+<!-- 							<iframe name="infoDutyScheduleList" class="main_cell_right" id="infoDutyScheduleList" th:src="@{/defaultIndex/defaultIndex/infoDutyScheduleList}" scrolling="no" width="100%" frameborder="0"></iframe>
+ -->						</div>
 						<div class="biaog03_div">查看更多</div>
 					</td>
 				</tr>
@@ -1102,6 +1102,8 @@
 <div id="zhezhao_mask" class="zhezhao_mask"></div>
 <!--这是遮罩层，默认是不显示的，设置透明度为0.1-->
 
+<script src="../js/jquery-ui-1.10.4.min.js" th:src="@{/js/jquery-ui-1.10.4.min.js}"></script>
+
 <script src="../oneself/chartjs/Chart.bundle.js" th:src="@{/oneself/chartjs/Chart.bundle.js}"></script>
 <script src="../oneself/chartjs/Chart.PieceLabel.js" th:src="@{/oneself/chartjs/Chart.PieceLabel.js}"></script>
 <script src="../oneself/chartjs/chartjs-plugin-datalabels.js" th:src="@{/oneself/chartjs/chartjs-plugin-datalabels.js}"></script>
@@ -1112,7 +1114,7 @@
 <script src="../oneself/customer_js/defaultIndex/defaultIndex_acTypeContrast_set.js?time=<%=new Date().getTime()%>" th:src="@{/oneself/customer_js/defaultIndex/defaultIndex_acTypeContrast_set.js}"></script>
 <script src="../oneself/customer_js/defaultIndex/defaultIndex_cruisingAltitude_set.js?time=<%=new Date().getTime()%>" th:src="@{/oneself/customer_js/defaultIndex/defaultIndex_cruisingAltitude_set.js}"></script>
 <script src="../oneself/customer_js/defaultIndex/defaultIndex_pitchAnalysis_set.js?time=<%=new Date().getTime()%>" th:src="@{/oneself/customer_js/defaultIndex/defaultIndex_pitchAnalysis_set.js}"></script>
-<script src="../oneself/customer_js/defaultIndex/defaultIndex_verticalacceleration_set.js?time=<%=new Date().getTime()%>" th:src="@{oneself/customer_js/defaultIndex/defaultIndex_verticalacceleration_set.js}"></script>
+<script src="../oneself/customer_js/defaultIndex/defaultIndex_verticalacceleration_set.js?time=<%=new Date().getTime()%>" th:src="@{/oneself/customer_js/defaultIndex/defaultIndex_verticalacceleration_set.js}"></script>
 <script type="text/javascript">
     var bodyWidth = $(document.body).width();//页面宽度
     /*模拟alert*/

infosouth-arj21/.classpath

@@ -28,5 +28,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

infosouth-arj21/pom.xml

@@ -18,5 +18,14 @@
             <groupId>cn.com.infosouth</groupId>
             <artifactId>infosouth-common</artifactId>
         </dependency>
+        
+        <!-- 核心模块-->
+        <dependency>
+            <groupId>cn.com.infosouth</groupId>
+            <artifactId>infosouth-framework</artifactId>
+        </dependency>
+        
+        
+        
     </dependencies>
 </project>

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/InfoFlightController.java

@@ -1,8 +1,9 @@
 package cn.com.infosouth.arj21.controller.csvmanager;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
-import com.github.pagehelper.Page;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -13,7 +14,9 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+
 import cn.com.infosouth.arj21.domain.InfoFlight;
+import cn.com.infosouth.arj21.service.IInfoAcTypeService;
 import cn.com.infosouth.arj21.service.IInfoFlightService;
 import cn.com.infosouth.common.annotation.Log;
 import cn.com.infosouth.common.core.controller.BaseController;
@@ -21,9 +24,7 @@ import cn.com.infosouth.common.core.domain.AjaxResult;
 import cn.com.infosouth.common.core.page.TableDataInfo;
 import cn.com.infosouth.common.enums.BusinessType;
 import cn.com.infosouth.common.utils.poi.ExcelUtil;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import cn.com.infosouth.framework.util.ShiroUtils;
 
 /**
  * 航班信息Controller
@@ -38,13 +39,48 @@ public class InfoFlightController extends BaseController {
 
 	@Autowired
 	private IInfoFlightService infoFlightService;
+	@Autowired
+	private IInfoAcTypeService infoAcTypeService;
 
 	@RequiresPermissions("arj21:flight:view")
 	@GetMapping()
-	public String flight() {
-		return prefix + "/flight";
+	public String flight(Model model) {
+		
+		List<String> acTypeList = infoAcTypeService.findacTpyeList();
+		model.addAttribute("acTypeList", acTypeList);
+		return prefix + "/qarDataExport";
 	}
 
+	/**   
+	 * @Title: getAcTypeByArn   
+	 * @Description: TODO(根据飞机号获取机型)   
+	 * @param: @param arn
+	 * @param: @return      
+	 * @return: Map<String,Object>      
+	 * @throws   
+	 */
+	@RequestMapping(value = "getAcTypeByArn")
+	@ResponseBody
+	public Map<String, Object> getAcTypeByArn(String arn) {
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("status", "1001");
+		map.put("data", "");
+		map.put("loginName", ShiroUtils.getLoginName());
+		//String info_ac_type_id = "";
+		String acType = "";
+		try {
+			acType = infoFlightService.getAcTypeByArn(arn);
+		} catch (Exception e) {
+			e.printStackTrace();
+			map.put("status", "1002");
+			logger.error("-------getAcTypeByArn()--查询出错！----------");
+		}
+		
+		map.put("data", acType);
+		
+		return map;
+	}
+	
 	/**
 	 * 查询航班信息列表
 	 */
@@ -121,6 +157,7 @@ public class InfoFlightController extends BaseController {
 		return toAjax(infoFlightService.deleteInfoFlightByIds(ids));
 	}
 
+	
 
 
 

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/InfoImexportLogController.java

@@ -0,0 +1,136 @@
+package cn.com.infosouth.arj21.controller.csvmanager;
+
+ 
+
+import java.util.List;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import cn.com.infosouth.arj21.domain.InfoImexportLog;
+import cn.com.infosouth.arj21.service.IInfoAcTypeService;
+import cn.com.infosouth.arj21.service.IInfoImexportLogService;
+import cn.com.infosouth.common.annotation.Log;
+import cn.com.infosouth.common.core.controller.BaseController;
+import cn.com.infosouth.common.core.domain.AjaxResult;
+import cn.com.infosouth.common.core.page.TableDataInfo;
+import cn.com.infosouth.common.enums.BusinessType;
+import cn.com.infosouth.common.utils.poi.ExcelUtil;
+
+/**
+ * 导入导出日志Controller
+ * 
+ * @author kxnf
+ * @date 2020-03-05
+ */
+@Controller
+@RequestMapping("/arj21/csvexport")
+public class InfoImexportLogController extends BaseController
+{
+    private String prefix = "arj21/csvmanager/log";
+
+    @Autowired
+    private IInfoImexportLogService infoImexportLogService;
+    @Autowired
+    private IInfoAcTypeService infoAcTypeService;
+    
+    @RequiresPermissions("arj21:csvexport:view")
+    @GetMapping()
+    public String csvexport(Model model)
+    {
+    	List<String> acTypeList = infoAcTypeService.findacTpyeList();
+		model.addAttribute("acTypeList", acTypeList);
+        return prefix + "/csvexport";
+    }
+
+    /**
+     * 查询导入导出日志列表
+     */
+    @RequiresPermissions("arj21:csvexport:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(InfoImexportLog infoImexportLog)
+    {
+        startPage();
+        List<InfoImexportLog> list = infoImexportLogService.selectInfoImexportLogList(infoImexportLog);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出导入导出日志列表
+     */
+    @RequiresPermissions("arj21:csvexport:export")
+    @Log(title = "导入导出日志", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(InfoImexportLog infoImexportLog)
+    {
+        List<InfoImexportLog> list = infoImexportLogService.selectInfoImexportLogList(infoImexportLog);
+        ExcelUtil<InfoImexportLog> util = new ExcelUtil<InfoImexportLog>(InfoImexportLog.class);
+        return util.exportExcel(list, "csvexport");
+    }
+
+    /**
+     * 新增导入导出日志
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存导入导出日志
+     */
+    @RequiresPermissions("arj21:csvexport:add")
+    @Log(title = "导入导出日志", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(InfoImexportLog infoImexportLog)
+    {
+        return toAjax(infoImexportLogService.insertInfoImexportLog(infoImexportLog));
+    }
+
+    /**
+     * 修改导入导出日志
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap)
+    {
+        InfoImexportLog infoImexportLog = infoImexportLogService.selectInfoImexportLogById(id);
+        mmap.put("infoImexportLog", infoImexportLog);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存导入导出日志
+     */
+    @RequiresPermissions("arj21:csvexport:edit")
+    @Log(title = "导入导出日志", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(InfoImexportLog infoImexportLog)
+    {
+        return toAjax(infoImexportLogService.updateInfoImexportLog(infoImexportLog));
+    }
+
+    /**
+     * 删除导入导出日志
+     */
+    @RequiresPermissions("arj21:csvexport:remove")
+    @Log(title = "导入导出日志", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(infoImexportLogService.deleteInfoImexportLogByIds(ids));
+    }
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/csvmanager/QARDataImportController.java

@@ -0,0 +1,350 @@
+package cn.com.infosouth.arj21.controller.csvmanager;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
+
+import cn.com.infosouth.arj21.domain.InfoAcType;
+import cn.com.infosouth.arj21.domain.InfoAircraft;
+import cn.com.infosouth.arj21.domain.InfoFlight;
+import cn.com.infosouth.arj21.domain.InfoHeaderParams;
+import cn.com.infosouth.arj21.domain.InfoImexportLog;
+import cn.com.infosouth.arj21.domain.InfoResource;
+import cn.com.infosouth.arj21.service.IInfoAcTypeService;
+import cn.com.infosouth.arj21.service.IInfoAircraftService;
+import cn.com.infosouth.arj21.service.IInfoFlightService;
+import cn.com.infosouth.arj21.service.IInfoHeaderParamsService;
+import cn.com.infosouth.arj21.service.IInfoImexportLogService;
+import cn.com.infosouth.arj21.service.IInfoResourceService;
+import cn.com.infosouth.arj21.utils_oneselef.FileUtils;
+import cn.com.infosouth.arj21.utils_oneselef.IdGeneratorUtils;
+import cn.com.infosouth.common.core.controller.BaseController;
+import cn.com.infosouth.common.utils.StringUtils;
+import cn.com.infosouth.framework.util.ShiroUtils;
+import cn.com.infosouth.system.domain.SysUser;
+
+/**
+ * @author Tiger
+ * @date 2020/3/6 9:32
+ * @description :
+ */
+@Controller
+@RequestMapping("/arj21/csvmanager/qarDataImport")
+public class QARDataImportController extends BaseController {
+
+    private String prefix = "arj21/csvmanager";
+    
+    @Resource
+    private IInfoResourceService infoResourceService;
+    @Resource
+    private IInfoAircraftService infoAircraftService;
+    @Resource
+    private IInfoAcTypeService infoActypeSevice;
+    @Resource
+    private IInfoFlightService infoFlightService;
+    @Resource
+    private IInfoHeaderParamsService infoHeaderParamsService;
+    @Resource
+    private IInfoImexportLogService infoImexportLogService;
+    
+	
+    @RequiresPermissions("csvmanager:qarDataImport:view")
+    @RequestMapping(value = {"import", ""})
+    public String _import(InfoFlight infoFlight, Model model) {
+        model.addAttribute("infoFlight", infoFlight);
+        return prefix + "/qarDataImport";
+    }
+
+    @RequiresPermissions("csvmanager:qarDataImport:upload")
+    @PostMapping("/upload")
+	@ResponseBody
+    public Map<String,String> upload(HttpServletRequest request, HttpServletResponse response,
+            @RequestParam("files") MultipartFile[]  files) throws IOException {
+    	System.out.println("");
+    	Enumeration<String> attributeNames = request.getSession().getAttributeNames();
+    	Map<String,String> returnMap = new HashMap<String, String>();
+		String index = request.getParameter("index");
+		if(files.length > 0){
+			String message = uploadSingleFile(request,files[0]);
+			returnMap.put("index", index);
+			returnMap.put("message", message);
+		}
+		return returnMap;
+    }
+
+
+    private String uploadSingleFile(HttpServletRequest request,MultipartFile files) throws IOException{
+		String fileName = files.getOriginalFilename();
+		//设置上传文件名
+		
+		System.out.println("01.上传文件名:"+fileName);
+		//文件名js已验证
+		/*if(fileName.length() <25){
+			out.print("2");
+			return;
+		}*/
+		
+		
+		//1.解析文件名中的飞机号,航班日期
+		String airNo = fileName.substring(0, 6);
+		//set AirNo
+		
+		InfoAircraft air = infoAircraftService.getByAcReg(airNo);
+		if(air == null){
+			return "飞机号不存在";
+		}
+		//通过飞机号查询机型,此处测试默认CRJ-900 //TODO
+		String airId = air.getId();//飞机id
+//		String acTypeId = air.getInfoAcType().getId(); //"CRJ-900";//机型 (id)
+		InfoAcType actype = infoActypeSevice.selectInfoAcTypeById(air.getInfoAcTypeId());
+		String acTypeId = "";
+		if(actype != null) {
+			acTypeId = actype.getId();
+		}
+		
+		String resourceId = air.getUploadDirId();
+
+		String flightDateStr = fileName.substring(7, 21);
+		Date flightDate = null;
+		InfoResource resource = infoResourceService.selectInfoResourceById(resourceId);
+		String csvPath = "";
+		if(resource != null){
+			csvPath = resource.getMappingPath();
+		}
+		try
+		{
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+			flightDate = sdf.parse(flightDateStr);
+		}
+		catch (ParseException e)
+		{
+			System.out.println(e.getMessage());
+		}
+		System.out.println("02.flightDateStr:"+flightDateStr);
+		
+		InfoFlight flight = new InfoFlight();
+		flight.setArn(airId);
+		flight.setFlDate(flightDate);
+		
+		String flightNo = " ";//航班号暂时默认为空
+		flight.setFlNo(flightNo);
+		String pod = "";//起飞机场
+		String poa = "";//落地机场
+		////////////////////////////////////////////////////////////正则匹配起落机场是否在CSV名中设置
+		//{0}_{1}_{2}-{3}.CSV
+		String pod_poa_str = fileName.substring(fileName.lastIndexOf('_')+1, fileName.lastIndexOf('.')).toUpperCase();
+		String regexStr = "^([A-Z]{3,6})\\-([A-Z]{3,6})$";
+		java.util.regex.Pattern pattern = java.util.regex.Pattern.compile(regexStr);
+		java.util.regex.Matcher matcher = pattern.matcher(pod_poa_str);
+		if(matcher.find())
+		{
+			pod = matcher.group(1);
+			poa = matcher.group(2);
+		}
+		
+		System.out.println("03.pod=" + pod + ", poa=" + poa);
+		
+		flight.setPod(pod);
+		flight.setPoa(poa);
+		flight.setRemarks("");
+		flight.setCsvName(fileName);
+		flight.setAcType(acTypeId);
+		flight.setInfoResourceId(resourceId);
+		flight.setCsvPath(csvPath);//hdfs存储路径\
+		
+		//创建导入导出日志实体类
+		InfoImexportLog oprationLogBean = new InfoImexportLog();
+		SysUser user = ShiroUtils.getSysUser();
+
+		String currentUserName = user.getLoginName();
+		//机型
+		
+		InfoAcType infoAcType = infoActypeSevice.selectInfoAcTypeById(acTypeId);
+		
+		oprationLogBean.setCsvName(fileName);
+		oprationLogBean.setArn(airNo);
+		oprationLogBean.setFlDate(flightDate);
+		oprationLogBean.setFlNo(flightNo);
+		oprationLogBean.setCsvPath(csvPath);
+		oprationLogBean.setOperateType("import");
+		oprationLogBean.setOperateBy(currentUserName);
+		oprationLogBean.setOperateDate(new Date());
+		oprationLogBean.setAcType(infoAcType.getAcTpye());
+		//设置用户的IP
+		try {
+			oprationLogBean.setHostIp(getClientIpAddr(request));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+        boolean flag = false;
+        boolean uploadflag = false;
+        String fileSizeStr = "";
+        //String uploadPath = request.getSession().getServletContext().getRealPath(path);
+        String uploadPath = "/tmp";
+        //根据机型插入机型对应的记录参数数据info_header_params
+        int version = actype.getVersionId().intValue();
+        InfoHeaderParams infoHeaderParams = infoHeaderParamsService.getByVersionId(version);
+        if(infoHeaderParams == null || !StringUtils.isNotEmpty(infoHeaderParams.getHeaderParams())){
+        	String headerParams = "";
+        	int headerIndex = actype.getCsvHeaderIndex().intValue();
+        	try {
+                BufferedReader reader = new BufferedReader(new InputStreamReader(files.getInputStream()));
+                String line = null;
+                while((line=reader.readLine())!=null){
+                	if(headerIndex == 0){
+                		headerParams = line.replace("\"", "");
+                		break;
+                	}
+                	headerIndex--;
+                }
+                if(infoHeaderParams == null)
+                	infoHeaderParams = new InfoHeaderParams();
+                infoHeaderParams.setVersionId(version + "");
+            	infoHeaderParams.setHeaderParams(headerParams);
+            	infoHeaderParams.setRemarks("");
+            	infoHeaderParams.setId(IdGeneratorUtils.uuid());
+            	infoHeaderParamsService.save(infoHeaderParams);
+            } catch (Exception e) {
+            	//读取csv参数名行时出错...
+            	System.out.println("读取csv参数名行时出错...");
+            	e.printStackTrace();
+            }
+        }
+        if (files.getSize() > 0) {
+            try {
+            	org.apache.commons.io.FileUtils.copyInputStreamToFile(files.getInputStream(),
+                        new File(uploadPath, files.getOriginalFilename()));//将上传的文件拷贝到上传文件临时目录
+            	fileSizeStr = FileUtils.getFileSizeByPath(uploadPath +"/" + files.getOriginalFilename());
+            	oprationLogBean.setFileSize(fileSizeStr);
+            	
+            	try {
+//					HDFSHandleService.uploadCSV2HDFSAsync(uploadPath +"/" + file.getOriginalFilename(), csvPath+File.separator+file.getOriginalFilename());
+					//直接将file.getInputStream()上传到hdfs，上一步就不需要了
+	            	oprationLogBean.setIsSucce("true");
+	            	oprationLogBean.setFailType("");
+	            	uploadflag = true;
+	            	
+	            	System.out.println("04.uploadCSV2HDFSAsync storageFullPath=>"+ csvPath+File.separator+files.getOriginalFilename());
+				} catch (Exception e) {
+					System.out.println("04.catch uploadCSV2HDFSAsync error=>"+ e.getMessage());
+					
+					System.out.println("上传失败，原因：HDFSHandleService.uploadCSV2HDFSAsync 异常：");
+	            	oprationLogBean.setIsSucce("false");
+	            	oprationLogBean.setFailType(e.getMessage());
+	            	e.printStackTrace();
+				}
+                if(!uploadflag){
+                	oprationLogBean.setIsSucce("false");
+	            	oprationLogBean.setFailType("上传失败，原因：HDFSHandleService.uploadCSV2HDFSAsync 异常");
+                }
+                
+                boolean result =infoFlightService.csvExist(fileName);
+                System.out.println("05.infoFlightService.csvExist（"+ fileName + ") => return result="+result);
+                
+        		if(result){
+        			//已上传过
+        			String oldCsvId= infoFlightService.getIdByCsvName(fileName);
+        			flight.setId(oldCsvId);
+        			
+        			flight.setUpdateDate(new Date());
+        		}
+        		flight.setCreateBy(user.getLoginName());
+        		flight.setId(IdGeneratorUtils.uuid());
+        		flight.setCreateDate(new Date());
+        		flight.setCreateTime(new Date());
+        		flight.setUpdateDate(new Date());
+        		flight.setUpdateTime(new Date());
+        		flight.setUpdateBy(user.getLoginName());
+        		flight.setRemarks(" ");
+        		flight.setDelFlag("0");
+        		infoFlightService.insertInfoFlight(flight);
+                flag = true;
+            } catch (Exception e) {
+            	System.out.println("上传失败：");
+            	oprationLogBean.setIsSucce("false");
+            	oprationLogBean.setFailType(e.getMessage());
+            	e.printStackTrace();
+            }
+            oprationLogBean.setId(IdGeneratorUtils.uuid());
+            oprationLogBean.setCreateDate(new Date());
+            oprationLogBean.setCreateTime(new Date());
+            oprationLogBean.setCreateBy(user.getLoginName());
+            oprationLogBean.setUpdateDate(new Date());
+            oprationLogBean.setUpdateTime(new Date());
+            oprationLogBean.setUpdateBy(user.getLoginName());
+            oprationLogBean.setRemarks(" ");
+            oprationLogBean.setDelFlag("0");
+            infoImexportLogService.insertInfoImexportLog(oprationLogBean);
+            
+        }
+        
+        if (flag == true) {
+            return "1";
+        } else {
+            return "上传失败";
+        }
+	}
+	
+    /**  
+     * @Description: 获取客户端IP地址    
+     */    
+    private String getClientIpAddr(HttpServletRequest request) {     
+           String ip = request.getHeader("x-forwarded-for");     
+           if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {     
+               ip = request.getHeader("Proxy-Client-IP");     
+           }     
+           if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {     
+               ip = request.getHeader("WL-Proxy-Client-IP");     
+           }     
+           if(ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {     
+               ip = request.getRemoteAddr();     
+               if(ip.equals("127.0.0.1")){       
+                   //根据网卡取本机配置的IP       
+                   InetAddress inet=null;       
+                   try {       
+                       inet = InetAddress.getLocalHost();       
+                   } catch (Exception e) {       
+                       e.printStackTrace();       
+                   }       
+                   ip= inet.getHostAddress();       
+               }    
+           }     
+           // 多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割    
+           if(ip != null && ip.length() > 15){      
+               if(ip.indexOf(",")>0){       
+                   ip = ip.substring(0,ip.indexOf(","));       
+               }       
+           }       
+           return ip;     
+    }
+
+ 
+
+
+
+
+
+
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/defaultIndex/DefaultIndexController.java

@@ -0,0 +1,146 @@
+package cn.com.infosouth.arj21.controller.defaultIndex;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.security.SecurityProperties.User;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+
+import cn.com.infosouth.arj21.domain.InfoVersion;
+import cn.com.infosouth.arj21.service.IInfoAcTypeService;
+import cn.com.infosouth.arj21.service.IInfoDutyScheduleService;
+import cn.com.infosouth.arj21.service.IInfoFlightService;
+import cn.com.infosouth.arj21.service.IInfoVersionService;
+import cn.com.infosouth.common.core.controller.BaseController;
+
+/**   
+ * @ClassName:  DefaultIndexController   
+ * @Description:TODO(默认首页)   
+ * @author: zy
+ * @date:   2018年3月14日 下午6:24:24   
+ *     
+ * @Copyright: 2018 Inc. All rights reserved. 
+ * 注意：本内容仅限深圳科信南方技术有限公司内部传阅，禁止外泄以及用于其他的商业目的
+ */
+@Controller
+@RequestMapping(value = "/defaultIndex/defaultIndex")
+public class DefaultIndexController extends BaseController {
+	
+	private Logger logger = LoggerFactory.getLogger(getClass());
+
+	@Autowired
+	private IInfoDutyScheduleService infoDutyScheduleService;
+	@Autowired
+	private IInfoVersionService infoVersionService;
+
+	@Autowired
+	private IInfoFlightService infoFlightService;
+	
+	@Autowired
+	private IInfoAcTypeService infoAcTypeService;
+	
+	private static String  static_acType_C900 = "AC700";
+	private static String  static_acType_B737 = "AC737";
+	private static String  static_acType_A320 = "AC320";
+	private static String  static_acType_B777 = "AC777";
+	private static String  static_acType_A330 = "AC330";
+	
+	/**   
+	 * @Title: initAcType   
+	 * @Description: TODO(初始化机型)   
+	 * @param: @param acTypeListByAcTypeNo      
+	 * @return: void      
+	 * @throws   
+	 */
+	public void initAcType(List<Map<String,String>> acTypeListByAcTypeNo){
+		for (int i = 0; i < acTypeListByAcTypeNo.size(); i++) {
+			Map<String, String> map = acTypeListByAcTypeNo.get(i);
+			if("1".equals(map.get("ac_type_no"))){
+				static_acType_C900 = map.get("ac_tpye");
+			}
+			if("2".equals(map.get("ac_type_no"))){
+				static_acType_B737 = map.get("ac_tpye");
+			}
+			if("3".equals(map.get("ac_type_no"))){
+				static_acType_A320 = map.get("ac_tpye");
+			}
+			if("4".equals(map.get("ac_type_no"))){
+				static_acType_B777 = map.get("ac_tpye");
+			}
+			if("5".equals(map.get("ac_type_no"))){
+				static_acType_A330 = map.get("ac_tpye");
+			}
+		}
+	}
+
+	@RequiresPermissions("defaultIndex:defaultIndex:view")
+	@RequestMapping(value = {"list", ""})
+	public String list(HttpServletRequest request, HttpServletResponse response, Model model) {
+		//机型列表
+		List<Map<String,String>> acTypeListByAcTypeNo = infoAcTypeService.findacTpyeMapList();
+		//初始化机型
+		initAcType(acTypeListByAcTypeNo);
+		
+		List<Map<String, String>> infoDutyScheduleList_CRJ900 = infoDutyScheduleService.findInfoDutyScheduleMapList(static_acType_C900);
+		List<Map<String, String>> infoDutyScheduleList_B737 = infoDutyScheduleService.findInfoDutyScheduleMapList(static_acType_B737);
+		List<Map<String, String>> infoDutyScheduleList_A320 = infoDutyScheduleService.findInfoDutyScheduleMapList(static_acType_A320);
+		List<Map<String, String>> infoDutyScheduleList_B777 = infoDutyScheduleService.findInfoDutyScheduleMapList(static_acType_B777);
+		List<Map<String, String>> infoDutyScheduleList_A330 = infoDutyScheduleService.findInfoDutyScheduleMapList(static_acType_A330);
+		
+		
+		
+		InfoVersion infoVersion = new InfoVersion();
+		List<InfoVersion> versionList = infoVersionService.findList(infoVersion);
+		
+		model.addAttribute("infoDutyScheduleList_CRJ900", infoDutyScheduleList_CRJ900);
+		model.addAttribute("infoDutyScheduleList_B737", infoDutyScheduleList_B737);
+		model.addAttribute("infoDutyScheduleList_A320", infoDutyScheduleList_A320);
+		model.addAttribute("infoDutyScheduleList_B777", infoDutyScheduleList_B777);
+		model.addAttribute("infoDutyScheduleList_A330", infoDutyScheduleList_A330);
+		
+		
+		//qar数量
+		String qarCount = infoFlightService.findFlightCount();
+		model.addAttribute("qarCount", qarCount);
+		
+		//model数量
+//		String modelCount = infoParameterComputedService.findModelCount();
+		model.addAttribute("modelCount", "0");
+		
+		//任务数量
+		String jobCount = infoDutyScheduleService.findJobCount();
+		model.addAttribute("jobCount", jobCount);
+		
+		model.addAttribute("versionList", versionList);
+		
+		 
+		
+		//model.addAttribute("acTypeListByAcTypeNo", acTypeListByAcTypeNo);
+		String acTypeListByAcTypeNoStr = "";
+		acTypeListByAcTypeNoStr = static_acType_C900+","+static_acType_B737+","+static_acType_A320+","+static_acType_B777+","+static_acType_A330;
+		
+		model.addAttribute("acType_row1", static_acType_C900);
+		model.addAttribute("acType_row2", static_acType_B737);
+		model.addAttribute("acType_row3", static_acType_A320);
+		model.addAttribute("acType_row4", static_acType_B777);
+		model.addAttribute("acType_row5", static_acType_A330);
+		
+		model.addAttribute("acTypeListByAcTypeNoStr", acTypeListByAcTypeNoStr);
+		return "modules/defaultIndex/defaultIndexList";
+	}
+	
+	 
+	
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/defaultIndex/InfoDefaultindexActypecontrastsetController.java

@@ -0,0 +1,84 @@
+/**
+ * Copyright &copy; 2013-2017 <a href="https://www.infosouth.com.cn/">Infosouth</a> All rights reserved.
+ */
+package cn.com.infosouth.arj21.controller.defaultIndex;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+
+import cn.com.infosouth.arj21.service.IInfoDefaultindexActypecontrastsetService;
+import cn.com.infosouth.common.core.controller.BaseController;
+ 
+
+/**
+ * 默认首页-机型数据对比设置Controller
+ * @author zy
+ * @version 2018-03-20
+ */
+@Controller
+@RequestMapping(value = "/arj21/defaultIndex/infoDefaultindexActypecontrastset")
+public class InfoDefaultindexActypecontrastsetController extends BaseController{
+
+	@Autowired
+	private IInfoDefaultindexActypecontrastsetService infoDefaultindexActypecontrastsetService;
+	
+	/**   
+	 * @Title: getParamsStatisticsResult   
+	 * @Description: TODO(获取参数统计结果，用于首页显示和打开模态框显示)   
+	 * @param: @param request
+	 * @param: @param response
+	 * @param: @param model
+	 * @param: @return      
+	 * @return: Map<String,Object>      
+	 * @throws   
+	 */
+	@RequiresPermissions("defaultIndex:defaultIndex:view")
+	@RequestMapping(value = {"getParamsStatisticsResult", ""})
+	@ResponseBody
+	public Map<String, Object> getParamsStatisticsResult(HttpServletRequest request, HttpServletResponse response, Model model){
+
+		Map<String, Object> returnMap = new HashMap<String, Object>();
+		returnMap.put("status", "1001");
+		returnMap.put("data", "");
+
+		// 查询数据库是否有相同设置
+		List<Map<String, String>> paramsetList = new ArrayList<Map<String, String>>();
+		JSONArray paramsetListJsonArr = new JSONArray();
+		try {
+			paramsetList = infoDefaultindexActypecontrastsetService.findActypecontrastSetData();
+			paramsetListJsonArr = JSONArray.parseArray(JSONObject.toJSONString(paramsetList));
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			logger.error("机型数据对比-getParamsStatisticsResult方法：查询异常，请稍后再试");
+			returnMap.put("status", "1002");
+			returnMap.put("data", "表格查询数据异常，请稍后再试");
+			return returnMap;
+		}
+		// 如果数据库中有相同的设置，则更新数据库中原有的
+		//-------------------
+		returnMap.put("data", paramsetListJsonArr);
+		return returnMap;
+	}
+	
+	
+	
+	
+	
+	 
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/parameter/InfoParameterComputedController.java

@@ -0,0 +1,126 @@
+package cn.com.infosouth.arj21.controller.parameter;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import cn.com.infosouth.common.annotation.Log;
+import cn.com.infosouth.common.enums.BusinessType;
+import cn.com.infosouth.arj21.domain.InfoParameterComputed;
+import cn.com.infosouth.arj21.service.IInfoParameterComputedService;
+import cn.com.infosouth.common.core.controller.BaseController;
+import cn.com.infosouth.common.core.domain.AjaxResult;
+import cn.com.infosouth.common.utils.poi.ExcelUtil;
+import cn.com.infosouth.common.core.page.TableDataInfo;
+
+/**
+ * 计算参数Controller
+ * 
+ * @author kxnf
+ * @date 2020-03-05
+ */
+@Controller
+@RequestMapping("/arj21/parameter_computed")
+public class InfoParameterComputedController extends BaseController
+{
+    private String prefix = "arj21/parameter_computed";
+
+    @Autowired
+    private IInfoParameterComputedService infoParameterComputedService;
+
+    @RequiresPermissions("arj21:parameter_computed:view")
+    @GetMapping()
+    public String parameter_computed()
+    {
+        return prefix + "/parameter_computed";
+    }
+
+    /**
+     * 查询计算参数列表
+     */
+    @RequiresPermissions("arj21:parameter_computed:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(InfoParameterComputed infoParameterComputed)
+    {
+        startPage();
+        List<InfoParameterComputed> list = infoParameterComputedService.selectInfoParameterComputedList(infoParameterComputed);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出计算参数列表
+     */
+    @RequiresPermissions("arj21:parameter_computed:export")
+    @Log(title = "计算参数", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(InfoParameterComputed infoParameterComputed)
+    {
+        List<InfoParameterComputed> list = infoParameterComputedService.selectInfoParameterComputedList(infoParameterComputed);
+        ExcelUtil<InfoParameterComputed> util = new ExcelUtil<InfoParameterComputed>(InfoParameterComputed.class);
+        return util.exportExcel(list, "parameter_computed");
+    }
+
+    /**
+     * 新增计算参数
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存计算参数
+     */
+    @RequiresPermissions("arj21:parameter_computed:add")
+    @Log(title = "计算参数", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(InfoParameterComputed infoParameterComputed)
+    {
+        return toAjax(infoParameterComputedService.insertInfoParameterComputed(infoParameterComputed));
+    }
+
+    /**
+     * 修改计算参数
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap)
+    {
+        InfoParameterComputed infoParameterComputed = infoParameterComputedService.selectInfoParameterComputedById(id);
+        mmap.put("infoParameterComputed", infoParameterComputed);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存计算参数
+     */
+    @RequiresPermissions("arj21:parameter_computed:edit")
+    @Log(title = "计算参数", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(InfoParameterComputed infoParameterComputed)
+    {
+        return toAjax(infoParameterComputedService.updateInfoParameterComputed(infoParameterComputed));
+    }
+
+    /**
+     * 删除计算参数
+     */
+    @RequiresPermissions("arj21:parameter_computed:remove")
+    @Log(title = "计算参数", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(infoParameterComputedService.deleteInfoParameterComputedByIds(ids));
+    }
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/controller/schedule/InfoDutyScheduleController.java

@@ -0,0 +1,126 @@
+package cn.com.infosouth.arj21.controller.schedule;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import cn.com.infosouth.common.annotation.Log;
+import cn.com.infosouth.common.enums.BusinessType;
+import cn.com.infosouth.arj21.domain.InfoDutySchedule;
+import cn.com.infosouth.arj21.service.IInfoDutyScheduleService;
+import cn.com.infosouth.common.core.controller.BaseController;
+import cn.com.infosouth.common.core.domain.AjaxResult;
+import cn.com.infosouth.common.utils.poi.ExcelUtil;
+import cn.com.infosouth.common.core.page.TableDataInfo;
+
+/**
+ * 任务调度Controller
+ * 
+ * @author kxnf
+ * @date 2020-03-05
+ */
+@Controller
+@RequestMapping("/arj21/duty_schedule")
+public class InfoDutyScheduleController extends BaseController
+{
+    private String prefix = "arj21/duty_schedule";
+
+    @Autowired
+    private IInfoDutyScheduleService infoDutyScheduleService;
+
+    @RequiresPermissions("arj21:duty_schedule:view")
+    @GetMapping()
+    public String duty_schedule()
+    {
+        return prefix + "/duty_schedule";
+    }
+
+    /**
+     * 查询任务调度列表
+     */
+    @RequiresPermissions("arj21:duty_schedule:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(InfoDutySchedule infoDutySchedule)
+    {
+        startPage();
+        List<InfoDutySchedule> list = infoDutyScheduleService.selectInfoDutyScheduleList(infoDutySchedule);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出任务调度列表
+     */
+    @RequiresPermissions("arj21:duty_schedule:export")
+    @Log(title = "任务调度", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(InfoDutySchedule infoDutySchedule)
+    {
+        List<InfoDutySchedule> list = infoDutyScheduleService.selectInfoDutyScheduleList(infoDutySchedule);
+        ExcelUtil<InfoDutySchedule> util = new ExcelUtil<InfoDutySchedule>(InfoDutySchedule.class);
+        return util.exportExcel(list, "duty_schedule");
+    }
+
+    /**
+     * 新增任务调度
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存任务调度
+     */
+    @RequiresPermissions("arj21:duty_schedule:add")
+    @Log(title = "任务调度", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(InfoDutySchedule infoDutySchedule)
+    {
+        return toAjax(infoDutyScheduleService.insertInfoDutySchedule(infoDutySchedule));
+    }
+
+    /**
+     * 修改任务调度
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") String id, ModelMap mmap)
+    {
+        InfoDutySchedule infoDutySchedule = infoDutyScheduleService.selectInfoDutyScheduleById(id);
+        mmap.put("infoDutySchedule", infoDutySchedule);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存任务调度
+     */
+    @RequiresPermissions("arj21:duty_schedule:edit")
+    @Log(title = "任务调度", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(InfoDutySchedule infoDutySchedule)
+    {
+        return toAjax(infoDutyScheduleService.updateInfoDutySchedule(infoDutySchedule));
+    }
+
+    /**
+     * 删除任务调度
+     */
+    @RequiresPermissions("arj21:duty_schedule:remove")
+    @Log(title = "任务调度", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(infoDutyScheduleService.deleteInfoDutyScheduleByIds(ids));
+    }
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoAircraft.java

@@ -16,7 +16,7 @@ public class InfoAircraft extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-    /** null */
+    /** id */
     private String id;
 
     /** 创建时间 */
@@ -50,6 +50,7 @@ public class InfoAircraft extends BaseEntity
     @Excel(name = "null")
     private String aircompanyid;
 
+
     public void setId(String id) 
     {
         this.id = id;

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoDefaultindexActypecontrastset.java

@@ -0,0 +1,742 @@
+/**
+ * Copyright &copy; 2013-2017 <a href="https://www.infosouth.com.cn/">Infosouth</a> All rights reserved.
+ */
+package cn.com.infosouth.arj21.domain;
+
+import javax.validation.constraints.Size;
+
+/**
+ * 默认首页-机型数据对比设置Entity
+ * @author zy
+ * @version 2018-03-21
+ */
+public class InfoDefaultindexActypecontrastset{
+	
+	private static final long serialVersionUID = 1L;
+	private String id;		//	id
+	private String loginAdmin;		// login_admin
+	private String statisticstitle;		// statisticstitle
+	private String chooseParamnameCol1;		// choose_paramname_col1
+	private String chooseParamnameCol2;		// choose_paramname_col2
+	private String chooseParamnameCol3;		// choose_paramname_col3
+	private String chooseParamnameCol4;		// choose_paramname_col4
+	private String jobidCrj900;		// jobid_crj900
+	private String jobidB737;		// jobid_b737
+	private String jobidA320;		// jobid_a320
+	private String jobidB777;		// jobid_b777
+	private String jobidA330;		// jobid_a330
+	private String modelnameCrj900Col1;		// modelname_crj900_col1
+	private String modelnameCrj900Col2;		// modelname_crj900_col2
+	private String modelnameCrj900Col3;		// modelname_crj900_col3
+	private String modelnameCrj900Col4;		// modelname_crj900_col4
+	private String modelnameB737Col1;		// modelname_b737_col1
+	private String modelnameB737Col2;		// modelname_b737_col2
+	private String modelnameB737Col3;		// modelname_b737_col3
+	private String modelnameB737Col4;		// modelname_b737_col4
+	private String modelnameA320Col1;		// modelname_a320_col1
+	private String modelnameA320Col2;		// modelname_a320_col2
+	private String modelnameA320Col3;		// modelname_a320_col3
+	private String modelnameA320Col4;		// modelname_a320_col4
+	private String modelnameB777Col1;		// modelname_b777_col1
+	private String modelnameB777Col2;		// modelname_b777_col2
+	private String modelnameB777Col3;		// modelname_b777_col3
+	private String modelnameB777Col4;		// modelname_b777_col4
+	private String modelnameA330Col1;		// modelname_a330_col1
+	private String modelnameA330Col2;		// modelname_a330_col2
+	private String modelnameA330Col3;		// modelname_a330_col3
+	private String modelnameA330Col4;		// modelname_a330_col4
+	private String paramnameCrj900Col1;		// paramname_crj900_col1
+	private String paramnameCrj900Col1Statisticsjson;		// paramname_crj900_col1_statisticsjson
+	private String paramnameCrj900Col2;		// paramname_crj900_col2
+	private String paramnameCrj900Col2Statisticsjson;		// paramname_crj900_col2_statisticsjson
+	private String paramnameCrj900Col3;		// paramname_crj900_col3
+	private String paramnameCrj900Col3Statisticsjson;		// paramname_crj900_col3_statisticsjson
+	private String paramnameCrj900Col4;		// paramname_crj900_col4
+	private String paramnameCrj900Col4Statisticsjson;		// paramname_crj900_col4_statisticsjson
+	private String paramnameB737Col1;		// paramname_b737_col1
+	private String paramnameB737Col1Statisticsjson;		// paramname_b737_col1_statisticsjson
+	private String paramnameB737Col2;		// paramname_b737_col2
+	private String paramnameB737Col2Statisticsjson;		// paramname_b737_col2_statisticsjson
+	private String paramnameB737Col3;		// paramname_b737_col3
+	private String paramnameB737Col3Statisticsjson;		// paramname_b737_col3_statisticsjson
+	private String paramnameB737Col4;		// paramname_b737_col4
+	private String paramnameB737Col4Statisticsjson;		// paramname_b737_col4_statisticsjson
+	private String paramnameA320Col1;		// paramname_a320_col1
+	private String paramnameA320Col1Statisticsjson;		// paramname_a320_col1_statisticsjson
+	private String paramnameA320Col2;		// paramname_a320_col2
+	private String paramnameA320Col2Statisticsjson;		// paramname_a320_col2_statisticsjson
+	private String paramnameA320Col3;		// paramname_a320_col3
+	private String paramnameA320Col3Statisticsjson;		// paramname_a320_col3_statisticsjson
+	private String paramnameA320Col4;		// paramname_a320_col4
+	private String paramnameA320Col4Statisticsjson;		// paramname_a320_col4_statisticsjson
+	private String paramnameB777Col1;		// paramname_b777_col1
+	private String paramnameB777Col1Statisticsjson;		// paramname_b777_col1_statisticsjson
+	private String paramnameB777Col2;		// paramname_b777_col2
+	private String paramnameB777Col2Statisticsjson;		// paramname_b777_col2_statisticsjson
+	private String paramnameB777Col3;		// paramname_b777_col3
+	private String paramnameB777Col3Statisticsjson;		// paramname_b777_col3_statisticsjson
+	private String paramnameB777Col4;		// paramname_b777_col4
+	private String paramnameB777Col4Statisticsjson;		// paramname_b777_col4_statisticsjson
+	private String paramnameA330Col1;		// paramname_a330_col1
+	private String paramnameA330Col1Statisticsjson;		// paramname_a330_col1_statisticsjson
+	private String paramnameA330Col2;		// paramname_a330_col2
+	private String paramnameA330Col2Statisticsjson;		// paramname_a330_col2_statisticsjson
+	private String paramnameA330Col3;		// paramname_a330_col3
+	private String paramnameA330Col3Statisticsjson;		// paramname_a330_col3_statisticsjson
+	private String paramnameA330Col4;		// paramname_a330_col4
+	private String paramnameA330Col4Statisticsjson;		// paramname_a330_col4_statisticsjson
+	
+	public InfoDefaultindexActypecontrastset() {
+		super();
+	}
+
+	@Size(min=0, max=30, message="login_admin长度必须介于 0 和 30 之间")
+	public String getLoginAdmin() {
+		return loginAdmin;
+	}
+
+	public void setLoginAdmin(String loginAdmin) {
+		this.loginAdmin = loginAdmin;
+	}
+	
+	@Size(min=0, max=64, message="statisticstitle长度必须介于 0 和 64 之间")
+	public String getStatisticstitle() {
+		return statisticstitle;
+	}
+
+	public void setStatisticstitle(String statisticstitle) {
+		this.statisticstitle = statisticstitle;
+	}
+	
+	@Size(min=0, max=64, message="choose_paramname_col1长度必须介于 0 和 64 之间")
+	public String getChooseParamnameCol1() {
+		return chooseParamnameCol1;
+	}
+
+	public void setChooseParamnameCol1(String chooseParamnameCol1) {
+		this.chooseParamnameCol1 = chooseParamnameCol1;
+	}
+	
+	@Size(min=0, max=64, message="choose_paramname_col2长度必须介于 0 和 64 之间")
+	public String getChooseParamnameCol2() {
+		return chooseParamnameCol2;
+	}
+
+	public void setChooseParamnameCol2(String chooseParamnameCol2) {
+		this.chooseParamnameCol2 = chooseParamnameCol2;
+	}
+	
+	@Size(min=0, max=64, message="choose_paramname_col3长度必须介于 0 和 64 之间")
+	public String getChooseParamnameCol3() {
+		return chooseParamnameCol3;
+	}
+
+	public void setChooseParamnameCol3(String chooseParamnameCol3) {
+		this.chooseParamnameCol3 = chooseParamnameCol3;
+	}
+	
+	@Size(min=0, max=64, message="choose_paramname_col4长度必须介于 0 和 64 之间")
+	public String getChooseParamnameCol4() {
+		return chooseParamnameCol4;
+	}
+
+	public void setChooseParamnameCol4(String chooseParamnameCol4) {
+		this.chooseParamnameCol4 = chooseParamnameCol4;
+	}
+	
+	@Size(min=0, max=64, message="jobid_crj900长度必须介于 0 和 64 之间")
+	public String getJobidCrj900() {
+		return jobidCrj900;
+	}
+
+	public void setJobidCrj900(String jobidCrj900) {
+		this.jobidCrj900 = jobidCrj900;
+	}
+	
+	@Size(min=0, max=64, message="jobid_b737长度必须介于 0 和 64 之间")
+	public String getJobidB737() {
+		return jobidB737;
+	}
+
+	public void setJobidB737(String jobidB737) {
+		this.jobidB737 = jobidB737;
+	}
+	
+	@Size(min=0, max=64, message="jobid_a320长度必须介于 0 和 64 之间")
+	public String getJobidA320() {
+		return jobidA320;
+	}
+
+	public void setJobidA320(String jobidA320) {
+		this.jobidA320 = jobidA320;
+	}
+	
+	@Size(min=0, max=64, message="jobid_b777长度必须介于 0 和 64 之间")
+	public String getJobidB777() {
+		return jobidB777;
+	}
+
+	public void setJobidB777(String jobidB777) {
+		this.jobidB777 = jobidB777;
+	}
+	
+	@Size(min=0, max=64, message="jobid_a330长度必须介于 0 和 64 之间")
+	public String getJobidA330() {
+		return jobidA330;
+	}
+
+	public void setJobidA330(String jobidA330) {
+		this.jobidA330 = jobidA330;
+	}
+	
+	@Size(min=0, max=64, message="modelname_crj900_col1长度必须介于 0 和 64 之间")
+	public String getModelnameCrj900Col1() {
+		return modelnameCrj900Col1;
+	}
+
+	public void setModelnameCrj900Col1(String modelnameCrj900Col1) {
+		this.modelnameCrj900Col1 = modelnameCrj900Col1;
+	}
+	
+	@Size(min=0, max=64, message="modelname_crj900_col2长度必须介于 0 和 64 之间")
+	public String getModelnameCrj900Col2() {
+		return modelnameCrj900Col2;
+	}
+
+	public void setModelnameCrj900Col2(String modelnameCrj900Col2) {
+		this.modelnameCrj900Col2 = modelnameCrj900Col2;
+	}
+	
+	@Size(min=0, max=64, message="modelname_crj900_col3长度必须介于 0 和 64 之间")
+	public String getModelnameCrj900Col3() {
+		return modelnameCrj900Col3;
+	}
+
+	public void setModelnameCrj900Col3(String modelnameCrj900Col3) {
+		this.modelnameCrj900Col3 = modelnameCrj900Col3;
+	}
+	
+	@Size(min=0, max=64, message="modelname_crj900_col4长度必须介于 0 和 64 之间")
+	public String getModelnameCrj900Col4() {
+		return modelnameCrj900Col4;
+	}
+
+	public void setModelnameCrj900Col4(String modelnameCrj900Col4) {
+		this.modelnameCrj900Col4 = modelnameCrj900Col4;
+	}
+	
+	@Size(min=0, max=64, message="modelname_b737_col1长度必须介于 0 和 64 之间")
+	public String getModelnameB737Col1() {
+		return modelnameB737Col1;
+	}
+
+	public void setModelnameB737Col1(String modelnameB737Col1) {
+		this.modelnameB737Col1 = modelnameB737Col1;
+	}
+	
+	@Size(min=0, max=64, message="modelname_b737_col2长度必须介于 0 和 64 之间")
+	public String getModelnameB737Col2() {
+		return modelnameB737Col2;
+	}
+
+	public void setModelnameB737Col2(String modelnameB737Col2) {
+		this.modelnameB737Col2 = modelnameB737Col2;
+	}
+	
+	@Size(min=0, max=64, message="modelname_b737_col3长度必须介于 0 和 64 之间")
+	public String getModelnameB737Col3() {
+		return modelnameB737Col3;
+	}
+
+	public void setModelnameB737Col3(String modelnameB737Col3) {
+		this.modelnameB737Col3 = modelnameB737Col3;
+	}
+	
+	@Size(min=0, max=64, message="modelname_b737_col4长度必须介于 0 和 64 之间")
+	public String getModelnameB737Col4() {
+		return modelnameB737Col4;
+	}
+
+	public void setModelnameB737Col4(String modelnameB737Col4) {
+		this.modelnameB737Col4 = modelnameB737Col4;
+	}
+	
+	@Size(min=0, max=64, message="modelname_a320_col1长度必须介于 0 和 64 之间")
+	public String getModelnameA320Col1() {
+		return modelnameA320Col1;
+	}
+
+	public void setModelnameA320Col1(String modelnameA320Col1) {
+		this.modelnameA320Col1 = modelnameA320Col1;
+	}
+	
+	@Size(min=0, max=64, message="modelname_a320_col2长度必须介于 0 和 64 之间")
+	public String getModelnameA320Col2() {
+		return modelnameA320Col2;
+	}
+
+	public void setModelnameA320Col2(String modelnameA320Col2) {
+		this.modelnameA320Col2 = modelnameA320Col2;
+	}
+	
+	@Size(min=0, max=64, message="modelname_a320_col3长度必须介于 0 和 64 之间")
+	public String getModelnameA320Col3() {
+		return modelnameA320Col3;
+	}
+
+	public void setModelnameA320Col3(String modelnameA320Col3) {
+		this.modelnameA320Col3 = modelnameA320Col3;
+	}
+	
+	@Size(min=0, max=64, message="modelname_a320_col4长度必须介于 0 和 64 之间")
+	public String getModelnameA320Col4() {
+		return modelnameA320Col4;
+	}
+
+	public void setModelnameA320Col4(String modelnameA320Col4) {
+		this.modelnameA320Col4 = modelnameA320Col4;
+	}
+	
+	@Size(min=0, max=64, message="modelname_b777_col1长度必须介于 0 和 64 之间")
+	public String getModelnameB777Col1() {
+		return modelnameB777Col1;
+	}
+
+	public void setModelnameB777Col1(String modelnameB777Col1) {
+		this.modelnameB777Col1 = modelnameB777Col1;
+	}
+	
+	@Size(min=0, max=64, message="modelname_b777_col2长度必须介于 0 和 64 之间")
+	public String getModelnameB777Col2() {
+		return modelnameB777Col2;
+	}
+
+	public void setModelnameB777Col2(String modelnameB777Col2) {
+		this.modelnameB777Col2 = modelnameB777Col2;
+	}
+	
+	@Size(min=0, max=64, message="modelname_b777_col3长度必须介于 0 和 64 之间")
+	public String getModelnameB777Col3() {
+		return modelnameB777Col3;
+	}
+
+	public void setModelnameB777Col3(String modelnameB777Col3) {
+		this.modelnameB777Col3 = modelnameB777Col3;
+	}
+	
+	@Size(min=0, max=64, message="modelname_b777_col4长度必须介于 0 和 64 之间")
+	public String getModelnameB777Col4() {
+		return modelnameB777Col4;
+	}
+
+	public void setModelnameB777Col4(String modelnameB777Col4) {
+		this.modelnameB777Col4 = modelnameB777Col4;
+	}
+	
+	@Size(min=0, max=64, message="modelname_a330_col1长度必须介于 0 和 64 之间")
+	public String getModelnameA330Col1() {
+		return modelnameA330Col1;
+	}
+
+	public void setModelnameA330Col1(String modelnameA330Col1) {
+		this.modelnameA330Col1 = modelnameA330Col1;
+	}
+	
+	@Size(min=0, max=64, message="modelname_a330_col2长度必须介于 0 和 64 之间")
+	public String getModelnameA330Col2() {
+		return modelnameA330Col2;
+	}
+
+	public void setModelnameA330Col2(String modelnameA330Col2) {
+		this.modelnameA330Col2 = modelnameA330Col2;
+	}
+	
+	@Size(min=0, max=64, message="modelname_a330_col3长度必须介于 0 和 64 之间")
+	public String getModelnameA330Col3() {
+		return modelnameA330Col3;
+	}
+
+	public void setModelnameA330Col3(String modelnameA330Col3) {
+		this.modelnameA330Col3 = modelnameA330Col3;
+	}
+	
+	@Size(min=0, max=64, message="modelname_a330_col4长度必须介于 0 和 64 之间")
+	public String getModelnameA330Col4() {
+		return modelnameA330Col4;
+	}
+
+	public void setModelnameA330Col4(String modelnameA330Col4) {
+		this.modelnameA330Col4 = modelnameA330Col4;
+	}
+	
+	@Size(min=0, max=64, message="paramname_crj900_col1长度必须介于 0 和 64 之间")
+	public String getParamnameCrj900Col1() {
+		return paramnameCrj900Col1;
+	}
+
+	public void setParamnameCrj900Col1(String paramnameCrj900Col1) {
+		this.paramnameCrj900Col1 = paramnameCrj900Col1;
+	}
+	
+	@Size(min=0, max=300, message="paramname_crj900_col1_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameCrj900Col1Statisticsjson() {
+		return paramnameCrj900Col1Statisticsjson;
+	}
+
+	public void setParamnameCrj900Col1Statisticsjson(String paramnameCrj900Col1Statisticsjson) {
+		this.paramnameCrj900Col1Statisticsjson = paramnameCrj900Col1Statisticsjson;
+	}
+	
+	@Size(min=0, max=64, message="paramname_crj900_col2长度必须介于 0 和 64 之间")
+	public String getParamnameCrj900Col2() {
+		return paramnameCrj900Col2;
+	}
+
+	public void setParamnameCrj900Col2(String paramnameCrj900Col2) {
+		this.paramnameCrj900Col2 = paramnameCrj900Col2;
+	}
+	
+	@Size(min=0, max=300, message="paramname_crj900_col2_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameCrj900Col2Statisticsjson() {
+		return paramnameCrj900Col2Statisticsjson;
+	}
+
+	public void setParamnameCrj900Col2Statisticsjson(String paramnameCrj900Col2Statisticsjson) {
+		this.paramnameCrj900Col2Statisticsjson = paramnameCrj900Col2Statisticsjson;
+	}
+	
+	@Size(min=0, max=64, message="paramname_crj900_col3长度必须介于 0 和 64 之间")
+	public String getParamnameCrj900Col3() {
+		return paramnameCrj900Col3;
+	}
+
+	public void setParamnameCrj900Col3(String paramnameCrj900Col3) {
+		this.paramnameCrj900Col3 = paramnameCrj900Col3;
+	}
+	
+	@Size(min=0, max=300, message="paramname_crj900_col3_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameCrj900Col3Statisticsjson() {
+		return paramnameCrj900Col3Statisticsjson;
+	}
+
+	public void setParamnameCrj900Col3Statisticsjson(String paramnameCrj900Col3Statisticsjson) {
+		this.paramnameCrj900Col3Statisticsjson = paramnameCrj900Col3Statisticsjson;
+	}
+	
+	@Size(min=0, max=64, message="paramname_crj900_col4长度必须介于 0 和 64 之间")
+	public String getParamnameCrj900Col4() {
+		return paramnameCrj900Col4;
+	}
+
+	public void setParamnameCrj900Col4(String paramnameCrj900Col4) {
+		this.paramnameCrj900Col4 = paramnameCrj900Col4;
+	}
+	
+	@Size(min=0, max=300, message="paramname_crj900_col4_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameCrj900Col4Statisticsjson() {
+		return paramnameCrj900Col4Statisticsjson;
+	}
+
+	public void setParamnameCrj900Col4Statisticsjson(String paramnameCrj900Col4Statisticsjson) {
+		this.paramnameCrj900Col4Statisticsjson = paramnameCrj900Col4Statisticsjson;
+	}
+	
+	@Size(min=0, max=64, message="paramname_b737_col1长度必须介于 0 和 64 之间")
+	public String getParamnameB737Col1() {
+		return paramnameB737Col1;
+	}
+
+	public void setParamnameB737Col1(String paramnameB737Col1) {
+		this.paramnameB737Col1 = paramnameB737Col1;
+	}
+	
+	@Size(min=0, max=300, message="paramname_b737_col1_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameB737Col1Statisticsjson() {
+		return paramnameB737Col1Statisticsjson;
+	}
+
+	public void setParamnameB737Col1Statisticsjson(String paramnameB737Col1Statisticsjson) {
+		this.paramnameB737Col1Statisticsjson = paramnameB737Col1Statisticsjson;
+	}
+	
+	@Size(min=0, max=64, message="paramname_b737_col2长度必须介于 0 和 64 之间")
+	public String getParamnameB737Col2() {
+		return paramnameB737Col2;
+	}
+
+	public void setParamnameB737Col2(String paramnameB737Col2) {
+		this.paramnameB737Col2 = paramnameB737Col2;
+	}
+	
+	@Size(min=0, max=300, message="paramname_b737_col2_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameB737Col2Statisticsjson() {
+		return paramnameB737Col2Statisticsjson;
+	}
+
+	public void setParamnameB737Col2Statisticsjson(String paramnameB737Col2Statisticsjson) {
+		this.paramnameB737Col2Statisticsjson = paramnameB737Col2Statisticsjson;
+	}
+	
+	@Size(min=0, max=64, message="paramname_b737_col3长度必须介于 0 和 64 之间")
+	public String getParamnameB737Col3() {
+		return paramnameB737Col3;
+	}
+
+	public void setParamnameB737Col3(String paramnameB737Col3) {
+		this.paramnameB737Col3 = paramnameB737Col3;
+	}
+	
+	@Size(min=0, max=300, message="paramname_b737_col3_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameB737Col3Statisticsjson() {
+		return paramnameB737Col3Statisticsjson;
+	}
+
+	public void setParamnameB737Col3Statisticsjson(String paramnameB737Col3Statisticsjson) {
+		this.paramnameB737Col3Statisticsjson = paramnameB737Col3Statisticsjson;
+	}
+	
+	@Size(min=0, max=64, message="paramname_b737_col4长度必须介于 0 和 64 之间")
+	public String getParamnameB737Col4() {
+		return paramnameB737Col4;
+	}
+
+	public void setParamnameB737Col4(String paramnameB737Col4) {
+		this.paramnameB737Col4 = paramnameB737Col4;
+	}
+	
+	@Size(min=0, max=300, message="paramname_b737_col4_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameB737Col4Statisticsjson() {
+		return paramnameB737Col4Statisticsjson;
+	}
+
+	public void setParamnameB737Col4Statisticsjson(String paramnameB737Col4Statisticsjson) {
+		this.paramnameB737Col4Statisticsjson = paramnameB737Col4Statisticsjson;
+	}
+	
+	@Size(min=0, max=64, message="paramname_a320_col1长度必须介于 0 和 64 之间")
+	public String getParamnameA320Col1() {
+		return paramnameA320Col1;
+	}
+
+	public void setParamnameA320Col1(String paramnameA320Col1) {
+		this.paramnameA320Col1 = paramnameA320Col1;
+	}
+	
+	@Size(min=0, max=300, message="paramname_a320_col1_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameA320Col1Statisticsjson() {
+		return paramnameA320Col1Statisticsjson;
+	}
+
+	public void setParamnameA320Col1Statisticsjson(String paramnameA320Col1Statisticsjson) {
+		this.paramnameA320Col1Statisticsjson = paramnameA320Col1Statisticsjson;
+	}
+	
+	@Size(min=0, max=64, message="paramname_a320_col2长度必须介于 0 和 64 之间")
+	public String getParamnameA320Col2() {
+		return paramnameA320Col2;
+	}
+
+	public void setParamnameA320Col2(String paramnameA320Col2) {
+		this.paramnameA320Col2 = paramnameA320Col2;
+	}
+	
+	@Size(min=0, max=300, message="paramname_a320_col2_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameA320Col2Statisticsjson() {
+		return paramnameA320Col2Statisticsjson;
+	}
+
+	public void setParamnameA320Col2Statisticsjson(String paramnameA320Col2Statisticsjson) {
+		this.paramnameA320Col2Statisticsjson = paramnameA320Col2Statisticsjson;
+	}
+	
+	@Size(min=0, max=64, message="paramname_a320_col3长度必须介于 0 和 64 之间")
+	public String getParamnameA320Col3() {
+		return paramnameA320Col3;
+	}
+
+	public void setParamnameA320Col3(String paramnameA320Col3) {
+		this.paramnameA320Col3 = paramnameA320Col3;
+	}
+	
+	@Size(min=0, max=300, message="paramname_a320_col3_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameA320Col3Statisticsjson() {
+		return paramnameA320Col3Statisticsjson;
+	}
+
+	public void setParamnameA320Col3Statisticsjson(String paramnameA320Col3Statisticsjson) {
+		this.paramnameA320Col3Statisticsjson = paramnameA320Col3Statisticsjson;
+	}
+	
+	@Size(min=0, max=64, message="paramname_a320_col4长度必须介于 0 和 64 之间")
+	public String getParamnameA320Col4() {
+		return paramnameA320Col4;
+	}
+
+	public void setParamnameA320Col4(String paramnameA320Col4) {
+		this.paramnameA320Col4 = paramnameA320Col4;
+	}
+	
+	@Size(min=0, max=300, message="paramname_a320_col4_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameA320Col4Statisticsjson() {
+		return paramnameA320Col4Statisticsjson;
+	}
+
+	public void setParamnameA320Col4Statisticsjson(String paramnameA320Col4Statisticsjson) {
+		this.paramnameA320Col4Statisticsjson = paramnameA320Col4Statisticsjson;
+	}
+	
+	@Size(min=0, max=64, message="paramname_b777_col1长度必须介于 0 和 64 之间")
+	public String getParamnameB777Col1() {
+		return paramnameB777Col1;
+	}
+
+	public void setParamnameB777Col1(String paramnameB777Col1) {
+		this.paramnameB777Col1 = paramnameB777Col1;
+	}
+	
+	@Size(min=0, max=300, message="paramname_b777_col1_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameB777Col1Statisticsjson() {
+		return paramnameB777Col1Statisticsjson;
+	}
+
+	public void setParamnameB777Col1Statisticsjson(String paramnameB777Col1Statisticsjson) {
+		this.paramnameB777Col1Statisticsjson = paramnameB777Col1Statisticsjson;
+	}
+	
+	@Size(min=0, max=64, message="paramname_b777_col2长度必须介于 0 和 64 之间")
+	public String getParamnameB777Col2() {
+		return paramnameB777Col2;
+	}
+
+	public void setParamnameB777Col2(String paramnameB777Col2) {
+		this.paramnameB777Col2 = paramnameB777Col2;
+	}
+	
+	@Size(min=0, max=300, message="paramname_b777_col2_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameB777Col2Statisticsjson() {
+		return paramnameB777Col2Statisticsjson;
+	}
+
+	public void setParamnameB777Col2Statisticsjson(String paramnameB777Col2Statisticsjson) {
+		this.paramnameB777Col2Statisticsjson = paramnameB777Col2Statisticsjson;
+	}
+	
+	@Size(min=0, max=64, message="paramname_b777_col3长度必须介于 0 和 64 之间")
+	public String getParamnameB777Col3() {
+		return paramnameB777Col3;
+	}
+
+	public void setParamnameB777Col3(String paramnameB777Col3) {
+		this.paramnameB777Col3 = paramnameB777Col3;
+	}
+	
+	@Size(min=0, max=300, message="paramname_b777_col3_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameB777Col3Statisticsjson() {
+		return paramnameB777Col3Statisticsjson;
+	}
+
+	public void setParamnameB777Col3Statisticsjson(String paramnameB777Col3Statisticsjson) {
+		this.paramnameB777Col3Statisticsjson = paramnameB777Col3Statisticsjson;
+	}
+	
+	@Size(min=0, max=64, message="paramname_b777_col4长度必须介于 0 和 64 之间")
+	public String getParamnameB777Col4() {
+		return paramnameB777Col4;
+	}
+
+	public void setParamnameB777Col4(String paramnameB777Col4) {
+		this.paramnameB777Col4 = paramnameB777Col4;
+	}
+	
+	@Size(min=0, max=300, message="paramname_b777_col4_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameB777Col4Statisticsjson() {
+		return paramnameB777Col4Statisticsjson;
+	}
+
+	public void setParamnameB777Col4Statisticsjson(String paramnameB777Col4Statisticsjson) {
+		this.paramnameB777Col4Statisticsjson = paramnameB777Col4Statisticsjson;
+	}
+	
+	@Size(min=0, max=64, message="paramname_a330_col1长度必须介于 0 和 64 之间")
+	public String getParamnameA330Col1() {
+		return paramnameA330Col1;
+	}
+
+	public void setParamnameA330Col1(String paramnameA330Col1) {
+		this.paramnameA330Col1 = paramnameA330Col1;
+	}
+	
+	@Size(min=0, max=300, message="paramname_a330_col1_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameA330Col1Statisticsjson() {
+		return paramnameA330Col1Statisticsjson;
+	}
+
+	public void setParamnameA330Col1Statisticsjson(String paramnameA330Col1Statisticsjson) {
+		this.paramnameA330Col1Statisticsjson = paramnameA330Col1Statisticsjson;
+	}
+	
+	@Size(min=0, max=64, message="paramname_a330_col2长度必须介于 0 和 64 之间")
+	public String getParamnameA330Col2() {
+		return paramnameA330Col2;
+	}
+
+	public void setParamnameA330Col2(String paramnameA330Col2) {
+		this.paramnameA330Col2 = paramnameA330Col2;
+	}
+	
+	@Size(min=0, max=300, message="paramname_a330_col2_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameA330Col2Statisticsjson() {
+		return paramnameA330Col2Statisticsjson;
+	}
+
+	public void setParamnameA330Col2Statisticsjson(String paramnameA330Col2Statisticsjson) {
+		this.paramnameA330Col2Statisticsjson = paramnameA330Col2Statisticsjson;
+	}
+	
+	@Size(min=0, max=64, message="paramname_a330_col3长度必须介于 0 和 64 之间")
+	public String getParamnameA330Col3() {
+		return paramnameA330Col3;
+	}
+
+	public void setParamnameA330Col3(String paramnameA330Col3) {
+		this.paramnameA330Col3 = paramnameA330Col3;
+	}
+	
+	@Size(min=0, max=300, message="paramname_a330_col3_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameA330Col3Statisticsjson() {
+		return paramnameA330Col3Statisticsjson;
+	}
+
+	public void setParamnameA330Col3Statisticsjson(String paramnameA330Col3Statisticsjson) {
+		this.paramnameA330Col3Statisticsjson = paramnameA330Col3Statisticsjson;
+	}
+	
+	@Size(min=0, max=64, message="paramname_a330_col4长度必须介于 0 和 64 之间")
+	public String getParamnameA330Col4() {
+		return paramnameA330Col4;
+	}
+
+	public void setParamnameA330Col4(String paramnameA330Col4) {
+		this.paramnameA330Col4 = paramnameA330Col4;
+	}
+	
+	@Size(min=0, max=300, message="paramname_a330_col4_statisticsjson长度必须介于 0 和 300 之间")
+	public String getParamnameA330Col4Statisticsjson() {
+		return paramnameA330Col4Statisticsjson;
+	}
+
+	public void setParamnameA330Col4Statisticsjson(String paramnameA330Col4Statisticsjson) {
+		this.paramnameA330Col4Statisticsjson = paramnameA330Col4Statisticsjson;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	 
+	
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoDutySchedule.java

@@ -0,0 +1,277 @@
+package cn.com.infosouth.arj21.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import cn.com.infosouth.common.annotation.Excel;
+import cn.com.infosouth.common.core.domain.BaseEntity;
+import java.util.Date;
+
+/**
+ * 任务调度对象 info_duty_schedule
+ * 
+ * @author kxnf
+ * @date 2020-03-05
+ */
+public class InfoDutySchedule extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** null */
+    private String id;
+
+    /** 任务名称 */
+    @Excel(name = "任务名称")
+    private String jobName;
+
+    /** 模型名称，多个用;分割 */
+    @Excel(name = "模型名称，多个用;分割")
+    private String modelName;
+
+    /** 机型，多个用;分割，为空表示不设限制 */
+    @Excel(name = "机型，多个用;分割，为空表示不设限制")
+    private String acType;
+
+    /** 飞机号，多个用;分割，为空表示不设限制 */
+    @Excel(name = "飞机号，多个用;分割，为空表示不设限制")
+    private String acReg;
+
+    /** 对应版本 */
+    @Excel(name = "对应版本")
+    private Long versionId;
+
+    /** 开始日期，为空表示不设限制 */
+    @Excel(name = "开始日期，为空表示不设限制", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startDate;
+
+    /** 结束日期，为空表示不设限制 */
+    @Excel(name = "结束日期，为空表示不设限制", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date endDate;
+
+    /** 任务描述 */
+    @Excel(name = "任务描述")
+    private String jobDesc;
+
+    /** 具体任务的执行状态 */
+    @Excel(name = "具体任务的执行状态")
+    private Integer isExcute;
+
+    /** 任务状态，正常/异常/ */
+    @Excel(name = "任务状态，正常/异常/")
+    private String jobStatus;
+
+    /** 执行周期 */
+    @Excel(name = "执行周期")
+    private String excuteFreq;
+
+    /** 创建时间 */
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createDate;
+
+    /** 更新时间 */
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updateDate;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 删除标志 */
+    private String delFlag;
+
+    /** job配置id */
+    @Excel(name = "job配置id")
+    private String jobConf;
+
+    /** 程序执行状态,-2,定时器停止；-1，定时器执行； */
+    @Excel(name = "程序执行状态,-2,定时器停止；-1，定时器执行；")
+    private Integer executeStatus;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setJobName(String jobName) 
+    {
+        this.jobName = jobName;
+    }
+
+    public String getJobName() 
+    {
+        return jobName;
+    }
+    public void setModelName(String modelName) 
+    {
+        this.modelName = modelName;
+    }
+
+    public String getModelName() 
+    {
+        return modelName;
+    }
+    public void setAcType(String acType) 
+    {
+        this.acType = acType;
+    }
+
+    public String getAcType() 
+    {
+        return acType;
+    }
+    public void setAcReg(String acReg) 
+    {
+        this.acReg = acReg;
+    }
+
+    public String getAcReg() 
+    {
+        return acReg;
+    }
+    public void setVersionId(Long versionId) 
+    {
+        this.versionId = versionId;
+    }
+
+    public Long getVersionId() 
+    {
+        return versionId;
+    }
+    public void setStartDate(Date startDate) 
+    {
+        this.startDate = startDate;
+    }
+
+    public Date getStartDate() 
+    {
+        return startDate;
+    }
+    public void setEndDate(Date endDate) 
+    {
+        this.endDate = endDate;
+    }
+
+    public Date getEndDate() 
+    {
+        return endDate;
+    }
+    public void setJobDesc(String jobDesc) 
+    {
+        this.jobDesc = jobDesc;
+    }
+
+    public String getJobDesc() 
+    {
+        return jobDesc;
+    }
+    public void setIsExcute(Integer isExcute) 
+    {
+        this.isExcute = isExcute;
+    }
+
+    public Integer getIsExcute() 
+    {
+        return isExcute;
+    }
+    public void setJobStatus(String jobStatus) 
+    {
+        this.jobStatus = jobStatus;
+    }
+
+    public String getJobStatus() 
+    {
+        return jobStatus;
+    }
+    public void setExcuteFreq(String excuteFreq) 
+    {
+        this.excuteFreq = excuteFreq;
+    }
+
+    public String getExcuteFreq() 
+    {
+        return excuteFreq;
+    }
+    public void setCreateDate(Date createDate) 
+    {
+        this.createDate = createDate;
+    }
+
+    public Date getCreateDate() 
+    {
+        return createDate;
+    }
+    public void setUpdateDate(Date updateDate) 
+    {
+        this.updateDate = updateDate;
+    }
+
+    public Date getUpdateDate() 
+    {
+        return updateDate;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setJobConf(String jobConf) 
+    {
+        this.jobConf = jobConf;
+    }
+
+    public String getJobConf() 
+    {
+        return jobConf;
+    }
+    public void setExecuteStatus(Integer executeStatus) 
+    {
+        this.executeStatus = executeStatus;
+    }
+
+    public Integer getExecuteStatus() 
+    {
+        return executeStatus;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("jobName", getJobName())
+            .append("modelName", getModelName())
+            .append("acType", getAcType())
+            .append("acReg", getAcReg())
+            .append("versionId", getVersionId())
+            .append("startDate", getStartDate())
+            .append("endDate", getEndDate())
+            .append("jobDesc", getJobDesc())
+            .append("isExcute", getIsExcute())
+            .append("jobStatus", getJobStatus())
+            .append("excuteFreq", getExcuteFreq())
+            .append("createBy", getCreateBy())
+            .append("createDate", getCreateDate())
+            .append("updateBy", getUpdateBy())
+            .append("updateDate", getUpdateDate())
+            .append("remarks", getRemarks())
+            .append("delFlag", getDelFlag())
+            .append("jobConf", getJobConf())
+            .append("executeStatus", getExecuteStatus())
+            .toString();
+    }
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoHeaderParams.java

@@ -0,0 +1,70 @@
+/**
+ * Copyright &copy; 2013-2017 <a href="https://www.infosouth.com.cn/">Infosouth</a> All rights reserved.
+ */
+package cn.com.infosouth.arj21.domain;
+
+import javax.validation.constraints.Size;
+
+/**
+ * 导入csv时不同机型对应的header参数Entity
+ * @author cyh
+ * @version 2018-03-06
+ */
+public class InfoHeaderParams{
+	
+	private static final long serialVersionUID = 1L;
+	private String id;	//id
+	private String versionId;		// 版本
+	private String headerParams;		// 参数
+	private String refParams;    //csv文件第一行参数
+	private String remarks;		//备注
+	
+	public InfoHeaderParams() {
+		super();
+	}
+
+	@Size(min=1, max=11, message="版本长度必须介于 1 和 11 之间")
+	public String getVersionId() {
+		return versionId;
+	}
+
+	public void setVersionId(String versionId) {
+		this.versionId = versionId;
+	}
+	
+	public String getHeaderParams() {
+		return headerParams;
+	}
+
+	public void setHeaderParams(String headerParams) {
+		this.headerParams = headerParams;
+	}
+
+	public String getRefParams() {
+		return this.refParams;
+	}
+
+	public void setRefParams(String refParams) {
+		this.refParams = refParams;
+	}
+
+	public String getRemarks() {
+		return remarks;
+	}
+
+	public void setRemarks(String remark) {
+		this.remarks = remark;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	
+	 
+	
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoImexportLog.java

@@ -0,0 +1,321 @@
+package cn.com.infosouth.arj21.domain;
+
+import cn.com.infosouth.common.annotation.Excel;
+import cn.com.infosouth.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import java.util.Date;
+
+/**
+ * 导入导出日志对象 info_imexport_log
+ * 
+ * @author kxnf
+ * @date 2020-03-05
+ */
+public class InfoImexportLog extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** null */
+    private String id;
+
+    /** 航班日期 */
+    @Excel(name = "航班日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date flDate;
+
+    /** 航班号 */
+    @Excel(name = "航班号")
+    private String flNo;
+
+    /** 飞机号 */
+    @Excel(name = "飞机号")
+    private String arn;
+
+    /** 机型 */
+    @Excel(name = "机型")
+    private String acType;
+
+    /** 起飞机场 */
+    @Excel(name = "起飞机场")
+    private String pod;
+
+    /** 到达机场 */
+    @Excel(name = "到达机场")
+    private String poa;
+
+    /** 所属公司 */
+    @Excel(name = "所属公司")
+    private String airline;
+
+    /** csv存储路径 */
+    @Excel(name = "csv存储路径")
+    private String csvPath;
+
+    /** csv文件名 */
+    @Excel(name = "csv文件名")
+    private String csvName;
+
+    /** 操作人 */
+    @Excel(name = "操作人")
+    private String operateBy;
+
+    /** 操作时间 */
+    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date operateDate;
+
+    /** ip */
+    @Excel(name = "ip")
+    private String hostIp;
+
+    /** 文件大小 */
+    @Excel(name = "文件大小")
+    private String fileSize;
+
+    /** 操作类型--导入，导出 */
+    @Excel(name = "操作类型--导入，导出")
+    private String operateType;
+
+    /** 是否成功 */
+    @Excel(name = "是否成功")
+    private String isSucce;
+
+    /** 失败原因 */
+    @Excel(name = "失败原因")
+    private String failType;
+
+    /** 创建时间 */
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createDate;
+
+    /** 更新时间 */
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updateDate;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+    
+
+    /** 删除标志 */
+    private String delFlag;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setFlDate(Date flDate) 
+    {
+        this.flDate = flDate;
+    }
+
+    public Date getFlDate() 
+    {
+        return flDate;
+    }
+    public void setFlNo(String flNo) 
+    {
+        this.flNo = flNo;
+    }
+
+    public String getFlNo() 
+    {
+        return flNo;
+    }
+    public void setArn(String arn) 
+    {
+        this.arn = arn;
+    }
+
+    public String getArn() 
+    {
+        return arn;
+    }
+    public void setAcType(String acType) 
+    {
+        this.acType = acType;
+    }
+
+    public String getAcType() 
+    {
+        return acType;
+    }
+    public void setPod(String pod) 
+    {
+        this.pod = pod;
+    }
+
+    public String getPod() 
+    {
+        return pod;
+    }
+    public void setPoa(String poa) 
+    {
+        this.poa = poa;
+    }
+
+    public String getPoa() 
+    {
+        return poa;
+    }
+    public void setAirline(String airline) 
+    {
+        this.airline = airline;
+    }
+
+    public String getAirline() 
+    {
+        return airline;
+    }
+    public void setCsvPath(String csvPath) 
+    {
+        this.csvPath = csvPath;
+    }
+
+    public String getCsvPath() 
+    {
+        return csvPath;
+    }
+    public void setCsvName(String csvName) 
+    {
+        this.csvName = csvName;
+    }
+
+    public String getCsvName() 
+    {
+        return csvName;
+    }
+    public void setOperateBy(String operateBy) 
+    {
+        this.operateBy = operateBy;
+    }
+
+    public String getOperateBy() 
+    {
+        return operateBy;
+    }
+    public void setOperateDate(Date operateDate) 
+    {
+        this.operateDate = operateDate;
+    }
+
+    public Date getOperateDate() 
+    {
+        return operateDate;
+    }
+    public void setHostIp(String hostIp) 
+    {
+        this.hostIp = hostIp;
+    }
+
+    public String getHostIp() 
+    {
+        return hostIp;
+    }
+    public void setFileSize(String fileSize) 
+    {
+        this.fileSize = fileSize;
+    }
+
+    public String getFileSize() 
+    {
+        return fileSize;
+    }
+    public void setOperateType(String operateType) 
+    {
+        this.operateType = operateType;
+    }
+
+    public String getOperateType() 
+    {
+        return operateType;
+    }
+    public void setIsSucce(String isSucce) 
+    {
+        this.isSucce = isSucce;
+    }
+
+    public String getIsSucce() 
+    {
+        return isSucce;
+    }
+    public void setFailType(String failType) 
+    {
+        this.failType = failType;
+    }
+
+    public String getFailType() 
+    {
+        return failType;
+    }
+    public void setCreateDate(Date createDate) 
+    {
+        this.createDate = createDate;
+    }
+
+    public Date getCreateDate() 
+    {
+        return createDate;
+    }
+    public void setUpdateDate(Date updateDate) 
+    {
+        this.updateDate = updateDate;
+    }
+
+    public Date getUpdateDate() 
+    {
+        return updateDate;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("flDate", getFlDate())
+            .append("flNo", getFlNo())
+            .append("arn", getArn())
+            .append("acType", getAcType())
+            .append("pod", getPod())
+            .append("poa", getPoa())
+            .append("airline", getAirline())
+            .append("csvPath", getCsvPath())
+            .append("csvName", getCsvName())
+            .append("operateBy", getOperateBy())
+            .append("operateDate", getOperateDate())
+            .append("hostIp", getHostIp())
+            .append("fileSize", getFileSize())
+            .append("operateType", getOperateType())
+            .append("isSucce", getIsSucce())
+            .append("failType", getFailType())
+            .append("createBy", getCreateBy())
+            .append("createDate", getCreateDate())
+            .append("updateBy", getUpdateBy())
+            .append("updateDate", getUpdateDate())
+            .append("remarks", getRemarks())
+            .append("delFlag", getDelFlag())
+            .toString();
+    }
+
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/domain/InfoParameterComputed.java

@@ -0,0 +1,266 @@
+package cn.com.infosouth.arj21.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import cn.com.infosouth.common.annotation.Excel;
+import cn.com.infosouth.common.core.domain.BaseEntity;
+import java.util.Date;
+
+/**
+ * 计算参数对象 info_parameter_computed
+ * 
+ * @author kxnf
+ * @date 2020-03-05
+ */
+public class InfoParameterComputed extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** null */
+    private String id;
+
+    /** 参数主表id */
+    private String prmId;
+
+    /** 版本id */
+    @Excel(name = "版本id")
+    private String infoVersion;
+
+    /** 类型：1:参数,2:平滑处理,(通用方法)3:模型 */
+    private Integer infoType;
+
+    /** 参数名 */
+    @Excel(name = "参数名")
+    private String prmName;
+
+    /** 参数描述 */
+    @Excel(name = "参数描述")
+    private String prmDesc;
+
+    /** null */
+    private String prmLanguage;
+
+    /** 脚本代码 */
+    private String scriptCode;
+
+    /** 脚本代码(python) */
+    private String pythonCode;
+
+    /** 编译顺序 */
+    @Excel(name = "编译顺序")
+    private Integer order;
+
+    /** 引用的参数 */
+    private String preferenceParams;
+
+    /** 模型需要导出的参数 */
+    private String exportParams;
+
+    /** 导出数据起始点 */
+    private Integer exportFrom;
+
+    /** 导出数据结束点 */
+    private Integer exportTo;
+
+    /** 创建时间 */
+    private Date createDate;
+
+    /** 更新时间 */
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updateDate;
+
+    /** 备注 */
+    private String remarks;
+
+    /** 删除标志 */
+    private String delFlag;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setPrmId(String prmId) 
+    {
+        this.prmId = prmId;
+    }
+
+    public String getPrmId() 
+    {
+        return prmId;
+    }
+    public void setInfoVersion(String infoVersion) 
+    {
+        this.infoVersion = infoVersion;
+    }
+
+    public String getInfoVersion() 
+    {
+        return infoVersion;
+    }
+    public void setInfoType(Integer infoType) 
+    {
+        this.infoType = infoType;
+    }
+
+    public Integer getInfoType() 
+    {
+        return infoType;
+    }
+    public void setPrmName(String prmName) 
+    {
+        this.prmName = prmName;
+    }
+
+    public String getPrmName() 
+    {
+        return prmName;
+    }
+    public void setPrmDesc(String prmDesc) 
+    {
+        this.prmDesc = prmDesc;
+    }
+
+    public String getPrmDesc() 
+    {
+        return prmDesc;
+    }
+    public void setPrmLanguage(String prmLanguage) 
+    {
+        this.prmLanguage = prmLanguage;
+    }
+
+    public String getPrmLanguage() 
+    {
+        return prmLanguage;
+    }
+    public void setScriptCode(String scriptCode) 
+    {
+        this.scriptCode = scriptCode;
+    }
+
+    public String getScriptCode() 
+    {
+        return scriptCode;
+    }
+    public void setPythonCode(String pythonCode) 
+    {
+        this.pythonCode = pythonCode;
+    }
+
+    public String getPythonCode() 
+    {
+        return pythonCode;
+    }
+    public void setOrder(Integer order) 
+    {
+        this.order = order;
+    }
+
+    public Integer getOrder() 
+    {
+        return order;
+    }
+    public void setPreferenceParams(String preferenceParams) 
+    {
+        this.preferenceParams = preferenceParams;
+    }
+
+    public String getPreferenceParams() 
+    {
+        return preferenceParams;
+    }
+    public void setExportParams(String exportParams) 
+    {
+        this.exportParams = exportParams;
+    }
+
+    public String getExportParams() 
+    {
+        return exportParams;
+    }
+    public void setExportFrom(Integer exportFrom) 
+    {
+        this.exportFrom = exportFrom;
+    }
+
+    public Integer getExportFrom() 
+    {
+        return exportFrom;
+    }
+    public void setExportTo(Integer exportTo) 
+    {
+        this.exportTo = exportTo;
+    }
+
+    public Integer getExportTo() 
+    {
+        return exportTo;
+    }
+    public void setCreateDate(Date createDate) 
+    {
+        this.createDate = createDate;
+    }
+
+    public Date getCreateDate() 
+    {
+        return createDate;
+    }
+    public void setUpdateDate(Date updateDate) 
+    {
+        this.updateDate = updateDate;
+    }
+
+    public Date getUpdateDate() 
+    {
+        return updateDate;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("prmId", getPrmId())
+            .append("infoVersion", getInfoVersion())
+            .append("infoType", getInfoType())
+            .append("prmName", getPrmName())
+            .append("prmDesc", getPrmDesc())
+            .append("prmLanguage", getPrmLanguage())
+            .append("scriptCode", getScriptCode())
+            .append("pythonCode", getPythonCode())
+            .append("order", getOrder())
+            .append("preferenceParams", getPreferenceParams())
+            .append("exportParams", getExportParams())
+            .append("exportFrom", getExportFrom())
+            .append("exportTo", getExportTo())
+            .append("createBy", getCreateBy())
+            .append("createDate", getCreateDate())
+            .append("updateBy", getUpdateBy())
+            .append("updateDate", getUpdateDate())
+            .append("remarks", getRemarks())
+            .append("delFlag", getDelFlag())
+            .toString();
+    }
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoAcTypeMapper.java

@@ -1,6 +1,8 @@
 package cn.com.infosouth.arj21.mapper;
 
 import java.util.List;
+import java.util.Map;
+
 import cn.com.infosouth.arj21.domain.InfoAcType;
 
 /**
@@ -58,4 +60,8 @@ public interface InfoAcTypeMapper
      * @return 结果
      */
     public int deleteInfoAcTypeByIds(String[] ids);
+
+	public List<Map<String, String>> findacTpyeMapList();
+
+	public List<String> findacTpyeList();
 }

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoAircraftMapper.java

@@ -58,4 +58,6 @@ public interface InfoAircraftMapper
      * @return 结果
      */
     public int deleteInfoAircraftByIds(String[] ids);
+
+	public InfoAircraft getByAcReg(String airNo);
 }

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoDefaultindexActypecontrastsetMapper.java

@@ -0,0 +1,24 @@
+/**
+ * Copyright &copy; 2013-2017 <a href="https://www.infosouth.com.cn/">Infosouth</a> All rights reserved.
+ */
+package cn.com.infosouth.arj21.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import cn.com.infosouth.arj21.domain.InfoDefaultindexActypecontrastset;
+
+
+/**
+ * 默认首页-机型数据对比设置DAO接口
+ * @author zy
+ * @version 2018-03-20
+ */
+@Mapper
+public interface InfoDefaultindexActypecontrastsetMapper{
+	public List<Map<String,String>> findActypecontrastSetData();
+
+	public List<InfoDefaultindexActypecontrastset> findList();
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoDutyScheduleMapper.java

@@ -0,0 +1,76 @@
+package cn.com.infosouth.arj21.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import cn.com.infosouth.arj21.domain.InfoDutySchedule;
+
+/**
+ * 任务调度Mapper接口
+ * 
+ * @author kxnf
+ * @date 2020-03-05
+ */
+public interface InfoDutyScheduleMapper 
+{
+    /**
+     * 查询任务调度
+     * 
+     * @param id 任务调度ID
+     * @return 任务调度
+     */
+    public InfoDutySchedule selectInfoDutyScheduleById(String id);
+
+    /**
+     * 查询任务调度列表
+     * 
+     * @param infoDutySchedule 任务调度
+     * @return 任务调度集合
+     */
+    public List<InfoDutySchedule> selectInfoDutyScheduleList(InfoDutySchedule infoDutySchedule);
+
+    /**
+     * 新增任务调度
+     * 
+     * @param infoDutySchedule 任务调度
+     * @return 结果
+     */
+    public int insertInfoDutySchedule(InfoDutySchedule infoDutySchedule);
+
+    /**
+     * 修改任务调度
+     * 
+     * @param infoDutySchedule 任务调度
+     * @return 结果
+     */
+    public int updateInfoDutySchedule(InfoDutySchedule infoDutySchedule);
+
+    /**
+     * 删除任务调度
+     * 
+     * @param id 任务调度ID
+     * @return 结果
+     */
+    public int deleteInfoDutyScheduleById(String id);
+
+    /**
+     * 批量删除任务调度
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteInfoDutyScheduleByIds(String[] ids);
+
+    /**
+     * 查找任务列表
+     * @param static_acType_B737
+     * @return
+     */
+	public List<Map<String, String>> findInfoDutyScheduleMapList(String static_acType_B737);
+
+	/**
+	 * 查找job数量
+	 * @return
+	 */
+	public String findJobCount();
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoFlightMapper.java

@@ -58,4 +58,17 @@ public interface InfoFlightMapper
      * @return 结果
      */
     public int deleteInfoFlightByIds(String[] ids);
+
+	public String findFlightCount();
+
+	/**
+	 * 根据飞机号获得飞机机型
+	 * @param arn
+	 * @return
+	 */
+	public String getAcTypeByArn(String arn);
+
+	public int csvExist(String csvName);
+
+	public String getIdByCsvName(String csvName);
 }

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoHeaderParamsMapper.java

@@ -0,0 +1,30 @@
+/**
+ * Copyright &copy; 2013-2017 <a href="https://www.infosouth.com.cn/">Infosouth</a> All rights reserved.
+ */
+package cn.com.infosouth.arj21.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import cn.com.infosouth.arj21.domain.InfoHeaderParams;
+
+
+/**
+ * 导入csv时不同机型对应的header参数DAO接口
+ * @author cyh
+ * @version 2018-03-06
+ */
+@Mapper
+public interface InfoHeaderParamsMapper{
+	public InfoHeaderParams getByVersionId(int versionId);
+	
+	public int addRefParams(@Param("versionId")String versionId,@Param("refParams")String refParams);
+	
+	public String checkRefParam(@Param("versionId")String versionId,@Param("refParam")String refParams);
+
+	public void insert();
+	
+	
+	
+	
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoImexportLogMapper.java

@@ -0,0 +1,62 @@
+package cn.com.infosouth.arj21.mapper;
+
+import cn.com.infosouth.arj21.domain.InfoImexportLog;
+
+import java.util.List;
+
+/**
+ * 导入导出日志Mapper接口
+ * 
+ * @author kxnf
+ * @date 2020-03-05
+ */
+public interface InfoImexportLogMapper 
+{
+    /**
+     * 查询导入导出日志
+     * 
+     * @param id 导入导出日志ID
+     * @return 导入导出日志
+     */
+    public InfoImexportLog selectInfoImexportLogById(String id);
+
+    /**
+     * 查询导入导出日志列表
+     * 
+     * @param infoImexportLog 导入导出日志
+     * @return 导入导出日志集合
+     */
+    public List<InfoImexportLog> selectInfoImexportLogList(InfoImexportLog infoImexportLog);
+
+    /**
+     * 新增导入导出日志
+     * 
+     * @param infoImexportLog 导入导出日志
+     * @return 结果
+     */
+    public int insertInfoImexportLog(InfoImexportLog infoImexportLog);
+
+    /**
+     * 修改导入导出日志
+     * 
+     * @param infoImexportLog 导入导出日志
+     * @return 结果
+     */
+    public int updateInfoImexportLog(InfoImexportLog infoImexportLog);
+
+    /**
+     * 删除导入导出日志
+     * 
+     * @param id 导入导出日志ID
+     * @return 结果
+     */
+    public int deleteInfoImexportLogById(String id);
+
+    /**
+     * 批量删除导入导出日志
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteInfoImexportLogByIds(String[] ids);
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/mapper/InfoParameterComputedMapper.java

@@ -0,0 +1,61 @@
+package cn.com.infosouth.arj21.mapper;
+
+import java.util.List;
+import cn.com.infosouth.arj21.domain.InfoParameterComputed;
+
+/**
+ * 计算参数Mapper接口
+ * 
+ * @author kxnf
+ * @date 2020-03-05
+ */
+public interface InfoParameterComputedMapper 
+{
+    /**
+     * 查询计算参数
+     * 
+     * @param id 计算参数ID
+     * @return 计算参数
+     */
+    public InfoParameterComputed selectInfoParameterComputedById(String id);
+
+    /**
+     * 查询计算参数列表
+     * 
+     * @param infoParameterComputed 计算参数
+     * @return 计算参数集合
+     */
+    public List<InfoParameterComputed> selectInfoParameterComputedList(InfoParameterComputed infoParameterComputed);
+
+    /**
+     * 新增计算参数
+     * 
+     * @param infoParameterComputed 计算参数
+     * @return 结果
+     */
+    public int insertInfoParameterComputed(InfoParameterComputed infoParameterComputed);
+
+    /**
+     * 修改计算参数
+     * 
+     * @param infoParameterComputed 计算参数
+     * @return 结果
+     */
+    public int updateInfoParameterComputed(InfoParameterComputed infoParameterComputed);
+
+    /**
+     * 删除计算参数
+     * 
+     * @param id 计算参数ID
+     * @return 结果
+     */
+    public int deleteInfoParameterComputedById(String id);
+
+    /**
+     * 批量删除计算参数
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteInfoParameterComputedByIds(String[] ids);
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoAcTypeService.java

@@ -1,6 +1,8 @@
 package cn.com.infosouth.arj21.service;
 
 import java.util.List;
+import java.util.Map;
+
 import cn.com.infosouth.arj21.domain.InfoAcType;
 
 /**
@@ -58,4 +60,16 @@ public interface IInfoAcTypeService
      * @return 结果
      */
     public int deleteInfoAcTypeById(String id);
+
+    /**
+     *   查找机型列表
+     * @return
+     */
+	public List<Map<String, String>> findacTpyeMapList();
+
+	/**
+	 * 查找机型列表
+	 * @return
+	 */
+	public List<String> findacTpyeList();
 }

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoAircraftService.java

@@ -58,4 +58,6 @@ public interface IInfoAircraftService
      * @return 结果
      */
     public int deleteInfoAircraftById(String id);
+
+	public InfoAircraft getByAcReg(String airNo);
 }

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoDefaultindexActypecontrastsetService.java

@@ -0,0 +1,17 @@
+package cn.com.infosouth.arj21.service;
+
+import java.util.List;
+import java.util.Map;
+
+import cn.com.infosouth.arj21.domain.InfoDefaultindexActypecontrastset;
+
+public interface IInfoDefaultindexActypecontrastsetService {
+
+	List<Map<String, String>> findActypecontrastSetData();
+
+	List<InfoDefaultindexActypecontrastset> findList(
+			InfoDefaultindexActypecontrastset infoDefaultindexActypecontrastset);
+
+	
+	
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoDutyScheduleService.java

@@ -0,0 +1,77 @@
+package cn.com.infosouth.arj21.service;
+
+import java.util.List;
+import java.util.Map;
+
+import cn.com.infosouth.arj21.domain.InfoDutySchedule;
+
+/**
+ * 任务调度Service接口
+ * 
+ * @author kxnf
+ * @date 2020-03-05
+ */
+public interface IInfoDutyScheduleService 
+{
+    /**
+     * 查询任务调度
+     * 
+     * @param id 任务调度ID
+     * @return 任务调度
+     */
+    public InfoDutySchedule selectInfoDutyScheduleById(String id);
+
+    /**
+     * 查询任务调度列表
+     * 
+     * @param infoDutySchedule 任务调度
+     * @return 任务调度集合
+     */
+    public List<InfoDutySchedule> selectInfoDutyScheduleList(InfoDutySchedule infoDutySchedule);
+
+    /**
+     * 新增任务调度
+     * 
+     * @param infoDutySchedule 任务调度
+     * @return 结果
+     */
+    public int insertInfoDutySchedule(InfoDutySchedule infoDutySchedule);
+
+    /**
+     * 修改任务调度
+     * 
+     * @param infoDutySchedule 任务调度
+     * @return 结果
+     */
+    public int updateInfoDutySchedule(InfoDutySchedule infoDutySchedule);
+
+    /**
+     * 批量删除任务调度
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteInfoDutyScheduleByIds(String ids);
+
+    /**
+     * 删除任务调度信息
+     * 
+     * @param id 任务调度ID
+     * @return 结果
+     */
+    public int deleteInfoDutyScheduleById(String id);
+    
+    /**
+     * 查找调度任务列表
+     * @param static_acType_B737
+     * @return
+     */
+    List<Map<String, String>> findInfoDutyScheduleMapList(String static_acType_B737);
+
+	/**
+	 * 任务数量
+	 * @return
+	 */
+	String findJobCount();
+}
+

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoFlightService.java

@@ -58,4 +58,23 @@ public interface IInfoFlightService
      * @return 结果
      */
     public int deleteInfoFlightById(String id);
+
+    /**
+     * qar数量
+     * @return
+     */
+	public String findFlightCount();
+
+	/**
+	 * 根据飞机号获取机型
+	 * @param arn
+	 * @return
+	 */
+	public String getAcTypeByArn(String arn);
+
+	public boolean csvExist(String fileName);
+
+	public String getIdByCsvName(String fileName);
+
+
 }

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoHeaderParamsService.java

@@ -0,0 +1,11 @@
+package cn.com.infosouth.arj21.service;
+
+import cn.com.infosouth.arj21.domain.InfoHeaderParams;
+
+public interface IInfoHeaderParamsService {
+
+	InfoHeaderParams getByVersionId(int version);
+
+	void save(InfoHeaderParams infoHeaderParams);
+
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoImexportLogService.java

@@ -0,0 +1,63 @@
+package cn.com.infosouth.arj21.service;
+
+import cn.com.infosouth.arj21.domain.InfoImexportLog;
+
+import java.util.List;
+
+
+/**
+ * 导入导出日志Service接口
+ * 
+ * @author kxnf
+ * @date 2020-03-05
+ */
+public interface IInfoImexportLogService 
+{
+    /**
+     * 查询导入导出日志
+     * 
+     * @param id 导入导出日志ID
+     * @return 导入导出日志
+     */
+    public InfoImexportLog selectInfoImexportLogById(String id);
+
+    /**
+     * 查询导入导出日志列表
+     * 
+     * @param infoImexportLog 导入导出日志
+     * @return 导入导出日志集合
+     */
+    public List<InfoImexportLog> selectInfoImexportLogList(InfoImexportLog infoImexportLog);
+
+    /**
+     * 新增导入导出日志
+     * 
+     * @param infoImexportLog 导入导出日志
+     * @return 结果
+     */
+    public int insertInfoImexportLog(InfoImexportLog infoImexportLog);
+
+    /**
+     * 修改导入导出日志
+     * 
+     * @param infoImexportLog 导入导出日志
+     * @return 结果
+     */
+    public int updateInfoImexportLog(InfoImexportLog infoImexportLog);
+
+    /**
+     * 批量删除导入导出日志
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteInfoImexportLogByIds(String ids);
+
+    /**
+     * 删除导入导出日志信息
+     * 
+     * @param id 导入导出日志ID
+     * @return 结果
+     */
+    public int deleteInfoImexportLogById(String id);
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoParameterComputedService.java

@@ -0,0 +1,61 @@
+package cn.com.infosouth.arj21.service;
+
+import java.util.List;
+import cn.com.infosouth.arj21.domain.InfoParameterComputed;
+
+/**
+ * 计算参数Service接口
+ * 
+ * @author kxnf
+ * @date 2020-03-05
+ */
+public interface IInfoParameterComputedService 
+{
+    /**
+     * 查询计算参数
+     * 
+     * @param id 计算参数ID
+     * @return 计算参数
+     */
+    public InfoParameterComputed selectInfoParameterComputedById(String id);
+
+    /**
+     * 查询计算参数列表
+     * 
+     * @param infoParameterComputed 计算参数
+     * @return 计算参数集合
+     */
+    public List<InfoParameterComputed> selectInfoParameterComputedList(InfoParameterComputed infoParameterComputed);
+
+    /**
+     * 新增计算参数
+     * 
+     * @param infoParameterComputed 计算参数
+     * @return 结果
+     */
+    public int insertInfoParameterComputed(InfoParameterComputed infoParameterComputed);
+
+    /**
+     * 修改计算参数
+     * 
+     * @param infoParameterComputed 计算参数
+     * @return 结果
+     */
+    public int updateInfoParameterComputed(InfoParameterComputed infoParameterComputed);
+
+    /**
+     * 批量删除计算参数
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteInfoParameterComputedByIds(String ids);
+
+    /**
+     * 删除计算参数信息
+     * 
+     * @param id 计算参数ID
+     * @return 结果
+     */
+    public int deleteInfoParameterComputedById(String id);
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/IInfoVersionService.java

@@ -58,4 +58,7 @@ public interface IInfoVersionService
      * @return 结果
      */
     public int deleteInfoVersionById(Long id);
+
+    
+	public List<InfoVersion> findList(InfoVersion infoVersion);
 }

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/IInfoDefaultindexActypecontrastsetServiceImpl.java

@@ -0,0 +1,32 @@
+package cn.com.infosouth.arj21.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import cn.com.infosouth.arj21.domain.InfoDefaultindexActypecontrastset;
+import cn.com.infosouth.arj21.mapper.InfoDefaultindexActypecontrastsetMapper;
+import cn.com.infosouth.arj21.service.IInfoDefaultindexActypecontrastsetService;
+
+@Service
+public class IInfoDefaultindexActypecontrastsetServiceImpl implements IInfoDefaultindexActypecontrastsetService{
+
+	@Autowired
+	private InfoDefaultindexActypecontrastsetMapper actypecontrastsetMapper;
+	
+	@Override
+	public List<Map<String, String>> findActypecontrastSetData() {
+		return actypecontrastsetMapper.findActypecontrastSetData();
+	}
+
+	@Override
+	public List<InfoDefaultindexActypecontrastset> findList(
+			InfoDefaultindexActypecontrastset infoDefaultindexActypecontrastset) {
+		return actypecontrastsetMapper.findList();
+	}
+
+	
+	
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/IInfoHeaderParamsServiceImpl.java

@@ -0,0 +1,27 @@
+package cn.com.infosouth.arj21.service.impl;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import cn.com.infosouth.arj21.domain.InfoHeaderParams;
+import cn.com.infosouth.arj21.mapper.InfoHeaderParamsMapper;
+import cn.com.infosouth.arj21.service.IInfoHeaderParamsService;
+
+@Service
+public class IInfoHeaderParamsServiceImpl implements IInfoHeaderParamsService{
+	
+	@Resource
+	private InfoHeaderParamsMapper infoHeaderParamsMapper;
+	
+	@Override
+	public InfoHeaderParams getByVersionId(int versionId) {
+		return infoHeaderParamsMapper.getByVersionId(versionId);
+	}
+
+	@Override
+	public void save(InfoHeaderParams infoHeaderParams) {
+		infoHeaderParamsMapper.insert();
+	}
+
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoAcTypeServiceImpl.java

@@ -1,6 +1,8 @@
 package cn.com.infosouth.arj21.service.impl;
 
 import java.util.List;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import cn.com.infosouth.arj21.mapper.InfoAcTypeMapper;
@@ -91,4 +93,14 @@ public class InfoAcTypeServiceImpl implements IInfoAcTypeService
     {
         return infoAcTypeMapper.deleteInfoAcTypeById(id);
     }
+
+	@Override
+	public List<Map<String, String>> findacTpyeMapList() {
+		return infoAcTypeMapper.findacTpyeMapList();
+	}
+
+	@Override
+	public List<String> findacTpyeList() {
+		return infoAcTypeMapper.findacTpyeList();
+	}
 }

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoAircraftServiceImpl.java

@@ -91,4 +91,9 @@ public class InfoAircraftServiceImpl implements IInfoAircraftService
     {
         return infoAircraftMapper.deleteInfoAircraftById(id);
     }
+
+	@Override
+	public InfoAircraft getByAcReg(String airNo) {
+		return infoAircraftMapper.getByAcReg(airNo);
+	}
 }

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoDutyScheduleServiceImpl.java

@@ -0,0 +1,106 @@
+package cn.com.infosouth.arj21.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.com.infosouth.arj21.mapper.InfoDutyScheduleMapper;
+import cn.com.infosouth.arj21.domain.InfoDutySchedule;
+import cn.com.infosouth.arj21.service.IInfoDutyScheduleService;
+import cn.com.infosouth.common.core.text.Convert;
+
+/**
+ * 任务调度Service业务层处理
+ * 
+ * @author kxnf
+ * @date 2020-03-05
+ */
+@Service
+public class InfoDutyScheduleServiceImpl implements IInfoDutyScheduleService 
+{
+    @Autowired
+    private InfoDutyScheduleMapper infoDutyScheduleMapper;
+
+    /**
+     * 查询任务调度
+     * 
+     * @param id 任务调度ID
+     * @return 任务调度
+     */
+    @Override
+    public InfoDutySchedule selectInfoDutyScheduleById(String id)
+    {
+        return infoDutyScheduleMapper.selectInfoDutyScheduleById(id);
+    }
+
+    /**
+     * 查询任务调度列表
+     * 
+     * @param infoDutySchedule 任务调度
+     * @return 任务调度
+     */
+    @Override
+    public List<InfoDutySchedule> selectInfoDutyScheduleList(InfoDutySchedule infoDutySchedule)
+    {
+        return infoDutyScheduleMapper.selectInfoDutyScheduleList(infoDutySchedule);
+    }
+
+    /**
+     * 新增任务调度
+     * 
+     * @param infoDutySchedule 任务调度
+     * @return 结果
+     */
+    @Override
+    public int insertInfoDutySchedule(InfoDutySchedule infoDutySchedule)
+    {
+        return infoDutyScheduleMapper.insertInfoDutySchedule(infoDutySchedule);
+    }
+
+    /**
+     * 修改任务调度
+     * 
+     * @param infoDutySchedule 任务调度
+     * @return 结果
+     */
+    @Override
+    public int updateInfoDutySchedule(InfoDutySchedule infoDutySchedule)
+    {
+        return infoDutyScheduleMapper.updateInfoDutySchedule(infoDutySchedule);
+    }
+
+    /**
+     * 删除任务调度对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteInfoDutyScheduleByIds(String ids)
+    {
+        return infoDutyScheduleMapper.deleteInfoDutyScheduleByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除任务调度信息
+     * 
+     * @param id 任务调度ID
+     * @return 结果
+     */
+    @Override
+    public int deleteInfoDutyScheduleById(String id)
+    {
+        return infoDutyScheduleMapper.deleteInfoDutyScheduleById(id);
+    }
+
+	@Override
+	public List<Map<String, String>> findInfoDutyScheduleMapList(String static_acType_B737) {
+		return infoDutyScheduleMapper.findInfoDutyScheduleMapList(static_acType_B737);
+	}
+
+	@Override
+	public String findJobCount() {
+		return infoDutyScheduleMapper.findJobCount();
+	}
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoFlightServiceImpl.java

@@ -91,4 +91,32 @@ public class InfoFlightServiceImpl implements IInfoFlightService
     {
         return infoFlightMapper.deleteInfoFlightById(id);
     }
+
+	@Override
+	public String findFlightCount() {
+		return infoFlightMapper.findFlightCount();
+	}
+
+	@Override
+	public String getAcTypeByArn(String arn) {
+		return infoFlightMapper.getAcTypeByArn(arn);
+	}
+
+	//csv文件是否已存在
+	@Override
+	public boolean csvExist(String csvName) {
+		int count = infoFlightMapper.csvExist(csvName);
+		return count > 0 ? true: false;
+	}
+
+	/**   
+	 * @Title: getIdByCsvName   
+	 * @Description: TODO(这里用一句话描述这个方法的作用)   
+	 * @param: @return      
+	 * @return: String      
+	 * @throws   
+	 */
+	public String getIdByCsvName(String csvName){
+		return infoFlightMapper.getIdByCsvName(csvName);
+	}
 }

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoImexportLogServiceImpl.java

@@ -0,0 +1,95 @@
+package cn.com.infosouth.arj21.service.impl;
+
+import java.util.List;
+
+import cn.com.infosouth.arj21.domain.InfoImexportLog;
+import cn.com.infosouth.arj21.mapper.InfoImexportLogMapper;
+import cn.com.infosouth.arj21.service.IInfoImexportLogService;
+import cn.com.infosouth.common.core.text.Convert;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 导入导出日志Service业务层处理
+ * 
+ * @author kxnf
+ * @date 2020-03-05
+ */
+@Service
+public class InfoImexportLogServiceImpl implements IInfoImexportLogService
+{
+    @Autowired
+    private InfoImexportLogMapper infoImexportLogMapper;
+
+    /**
+     * 查询导入导出日志
+     * 
+     * @param id 导入导出日志ID
+     * @return 导入导出日志
+     */
+    @Override
+    public InfoImexportLog selectInfoImexportLogById(String id)
+    {
+        return infoImexportLogMapper.selectInfoImexportLogById(id);
+    }
+
+    /**
+     * 查询导入导出日志列表
+     * 
+     * @param infoImexportLog 导入导出日志
+     * @return 导入导出日志
+     */
+    @Override
+    public List<InfoImexportLog> selectInfoImexportLogList(InfoImexportLog infoImexportLog)
+    {
+        return infoImexportLogMapper.selectInfoImexportLogList(infoImexportLog);
+    }
+
+    /**
+     * 新增导入导出日志
+     * 
+     * @param infoImexportLog 导入导出日志
+     * @return 结果
+     */
+    @Override
+    public int insertInfoImexportLog(InfoImexportLog infoImexportLog)
+    {
+        return infoImexportLogMapper.insertInfoImexportLog(infoImexportLog);
+    }
+
+    /**
+     * 修改导入导出日志
+     * 
+     * @param infoImexportLog 导入导出日志
+     * @return 结果
+     */
+    @Override
+    public int updateInfoImexportLog(InfoImexportLog infoImexportLog)
+    {
+        return infoImexportLogMapper.updateInfoImexportLog(infoImexportLog);
+    }
+
+    /**
+     * 删除导入导出日志对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteInfoImexportLogByIds(String ids)
+    {
+        return infoImexportLogMapper.deleteInfoImexportLogByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除导入导出日志信息
+     * 
+     * @param id 导入导出日志ID
+     * @return 结果
+     */
+    @Override
+    public int deleteInfoImexportLogById(String id)
+    {
+        return infoImexportLogMapper.deleteInfoImexportLogById(id);
+    }
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoParameterComputedServiceImpl.java

@@ -0,0 +1,94 @@
+package cn.com.infosouth.arj21.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.com.infosouth.arj21.mapper.InfoParameterComputedMapper;
+import cn.com.infosouth.arj21.domain.InfoParameterComputed;
+import cn.com.infosouth.arj21.service.IInfoParameterComputedService;
+import cn.com.infosouth.common.core.text.Convert;
+
+/**
+ * 计算参数Service业务层处理
+ * 
+ * @author kxnf
+ * @date 2020-03-05
+ */
+@Service
+public class InfoParameterComputedServiceImpl implements IInfoParameterComputedService 
+{
+    @Autowired
+    private InfoParameterComputedMapper infoParameterComputedMapper;
+
+    /**
+     * 查询计算参数
+     * 
+     * @param id 计算参数ID
+     * @return 计算参数
+     */
+    @Override
+    public InfoParameterComputed selectInfoParameterComputedById(String id)
+    {
+        return infoParameterComputedMapper.selectInfoParameterComputedById(id);
+    }
+
+    /**
+     * 查询计算参数列表
+     * 
+     * @param infoParameterComputed 计算参数
+     * @return 计算参数
+     */
+    @Override
+    public List<InfoParameterComputed> selectInfoParameterComputedList(InfoParameterComputed infoParameterComputed)
+    {
+        return infoParameterComputedMapper.selectInfoParameterComputedList(infoParameterComputed);
+    }
+
+    /**
+     * 新增计算参数
+     * 
+     * @param infoParameterComputed 计算参数
+     * @return 结果
+     */
+    @Override
+    public int insertInfoParameterComputed(InfoParameterComputed infoParameterComputed)
+    {
+        return infoParameterComputedMapper.insertInfoParameterComputed(infoParameterComputed);
+    }
+
+    /**
+     * 修改计算参数
+     * 
+     * @param infoParameterComputed 计算参数
+     * @return 结果
+     */
+    @Override
+    public int updateInfoParameterComputed(InfoParameterComputed infoParameterComputed)
+    {
+        return infoParameterComputedMapper.updateInfoParameterComputed(infoParameterComputed);
+    }
+
+    /**
+     * 删除计算参数对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteInfoParameterComputedByIds(String ids)
+    {
+        return infoParameterComputedMapper.deleteInfoParameterComputedByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除计算参数信息
+     * 
+     * @param id 计算参数ID
+     * @return 结果
+     */
+    @Override
+    public int deleteInfoParameterComputedById(String id)
+    {
+        return infoParameterComputedMapper.deleteInfoParameterComputedById(id);
+    }
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/service/impl/InfoVersionServiceImpl.java

@@ -91,4 +91,10 @@ public class InfoVersionServiceImpl implements IInfoVersionService
     {
         return infoVersionMapper.deleteInfoVersionById(id);
     }
+
+	@Override
+	public List<InfoVersion> findList(InfoVersion infoVersion) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/utils_oneselef/FileUtils.java

@@ -0,0 +1,31 @@
+package cn.com.infosouth.arj21.utils_oneselef;
+
+import java.io.File;
+
+/**
+ * 自定义文件工具类
+ * @author lenove
+ *
+ */
+public class FileUtils {
+
+	
+	// 将byte流输出到文件
+ 	public static String getFileSizeByPath(String dstFilePath) {
+ 		String fileSize = "";
+ 		File file = null;
+ 		try {
+ 			file = new File(dstFilePath);
+ 			if (!file.exists() && file.isDirectory()) {// 判断是否是文件夹
+ 				file.mkdirs();
+ 				System.out.println("there not exist that file" + dstFilePath);
+ 			} else {
+ 				fileSize = String.valueOf(file.length());
+ 			}
+ 		} catch (Exception e) {
+ 			e.printStackTrace();
+ 		}
+ 		return fileSize;
+ 	}
+	
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/utils_oneselef/IdGeneratorUtils.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright &copy; 2013-2017 <a href="https://www.infosouth.com.cn/">Infosouth</a> All rights reserved.
+ */
+package cn.com.infosouth.arj21.utils_oneselef;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.io.Resource;
+
+/**
+ * 代码生成工具类
+ * @author numberone
+ * @version 2013-11-16
+ */
+public class IdGeneratorUtils {
+
+	private static Logger logger = LoggerFactory.getLogger(IdGeneratorUtils.class);
+
+	/**
+	 * 封装JDK自带的UUID, 通过Random数字生成, 中间无-分割.
+	 */
+	public static String uuid() {
+		return UUID.randomUUID().toString().replaceAll("-", "");
+	}
+	
+}

infosouth-arj21/src/main/java/cn/com/infosouth/arj21/utils_oneselef/comment

@@ -0,0 +1 @@
+自己编写的工具类

infosouth-arj21/src/main/resources/mapper/InfoAcTypeMapper.xml

@@ -99,4 +99,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
     
+    <select id="findacTpyeList" resultType="String">
+		SELECT 
+			b.ac_tpye
+		FROM info_ac_type b
+		<where>
+			b.del_flag = 0
+		</where>	
+		ORDER BY b.ac_tpye
+	</select>
+	
 </mapper>

infosouth-arj21/src/main/resources/mapper/InfoAircraftMapper.xml

@@ -17,12 +17,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="uploadDirId"    column="upload_dir_id"    />
         <result property="aircompanyid"    column="airCompanyId"    />
     </resultMap>
+    
 
+	<sql id="infoAircraftJoins">
+		left join info_ac_type b on b.id = a.info_ac_type_id
+		left join info_resource c on c.id = a.upload_dir_id
+		left join info_version v on b.version_id = v.id
+		left join sys_office o on a.airCompanyId = o.id
+	</sql>
+
+	<sql id="infoAircraftColumns">
+		a.id AS "id",
+		a.create_by AS "create_by",
+		a.create_date AS "create_date",
+		a.update_by AS "update_by",
+		a.update_date AS "update_by",
+		a.remarks AS "remarks",
+		a.del_flag AS "del_flag",
+		a.ac_reg AS "ac_reg",
+		a.info_ac_type_id AS "info_ac_type_id",
+		a.upload_dir_id AS "upload_dir_id",
+		a.airCompanyId AS "airCompanyId",		
+		v.csv_header_index AS "infoAcType.csvHeaderIndex",
+		v.csv_content_index AS "infoAcType.csvContentIndex",
+		b.version_id AS "infoAcType.versionId",
+		b.ac_tpye AS "infoAcType.acTpye",
+		b.remarks AS "infoAcType.remarks",
+		c.mapping_path AS "infoResource.mappingPath",
+		c.id AS "resParentId",
+		o.name AS "airCompanyName"
+	</sql>
     <sql id="selectInfoAircraftVo">
         select id, create_by, create_date, update_by, update_date, remarks, del_flag, ac_reg, info_ac_type_id, upload_dir_id, airCompanyId from info_aircraft
     </sql>
 
-    <select id="selectInfoAircraftList" parameterType="InfoAircraft" resultMap="InfoAircraftResult">
+    <select id="selectInfoAircraftList" parameterType="InfoAircraft"  >
         <include refid="selectInfoAircraftVo"/>
         <where>  
             <if test="acReg != null  and acReg != ''"> and ac_reg = #{acReg}</if>
@@ -31,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectInfoAircraftById" parameterType="String" resultMap="InfoAircraftResult">
+    <select id="selectInfoAircraftById" parameterType="String" >
         <include refid="selectInfoAircraftVo"/>
         where id = #{id}
     </select>
@@ -94,4 +123,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
     
+    <select id="getByAcReg" resultMap="InfoAircraftResult">
+		SELECT 
+			<include refid="infoAircraftColumns"/>
+		FROM info_aircraft a
+		<include refid="infoAircraftJoins"/>
+		WHERE a.ac_reg = #{acReg}
+	</select>
+    
 </mapper>

infosouth-arj21/src/main/resources/mapper/InfoDefaultindexActypecontrastsetDao.xml

@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="InfoDefaultindexActypecontrastsetMapper">
+    
+	<sql id="infoDefaultindexActypecontrastsetColumns">
+		a.id AS "id",
+		a.login_admin AS "loginAdmin",
+		a.statisticstitle AS "statisticstitle",
+		a.choose_paramname_col1 AS "chooseParamnameCol1",
+		a.choose_paramname_col2 AS "chooseParamnameCol2",
+		a.choose_paramname_col3 AS "chooseParamnameCol3",
+		a.choose_paramname_col4 AS "chooseParamnameCol4",
+		a.jobid_crj900 AS "jobidCrj900",
+		a.jobid_b737 AS "jobidB737",
+		a.jobid_a320 AS "jobidA320",
+		a.jobid_b777 AS "jobidB777",
+		a.jobid_a330 AS "jobidA330",
+		a.modelname_crj900_col1 AS "modelnameCrj900Col1",
+		a.modelname_crj900_col2 AS "modelnameCrj900Col2",
+		a.modelname_crj900_col3 AS "modelnameCrj900Col3",
+		a.modelname_crj900_col4 AS "modelnameCrj900Col4",
+		a.modelname_b737_col1 AS "modelnameB737Col1",
+		a.modelname_b737_col2 AS "modelnameB737Col2",
+		a.modelname_b737_col3 AS "modelnameB737Col3",
+		a.modelname_b737_col4 AS "modelnameB737Col4",
+		a.modelname_a320_col1 AS "modelnameA320Col1",
+		a.modelname_a320_col2 AS "modelnameA320Col2",
+		a.modelname_a320_col3 AS "modelnameA320Col3",
+		a.modelname_a320_col4 AS "modelnameA320Col4",
+		a.modelname_b777_col1 AS "modelnameB777Col1",
+		a.modelname_b777_col2 AS "modelnameB777Col2",
+		a.modelname_b777_col3 AS "modelnameB777Col3",
+		a.modelname_b777_col4 AS "modelnameB777Col4",
+		a.modelname_a330_col1 AS "modelnameA330Col1",
+		a.modelname_a330_col2 AS "modelnameA330Col2",
+		a.modelname_a330_col3 AS "modelnameA330Col3",
+		a.modelname_a330_col4 AS "modelnameA330Col4",
+		a.paramname_crj900_col1 AS "paramnameCrj900Col1",
+		a.paramname_crj900_col1_statisticsjson AS "paramnameCrj900Col1Statisticsjson",
+		a.paramname_crj900_col2 AS "paramnameCrj900Col2",
+		a.paramname_crj900_col2_statisticsjson AS "paramnameCrj900Col2Statisticsjson",
+		a.paramname_crj900_col3 AS "paramnameCrj900Col3",
+		a.paramname_crj900_col3_statisticsjson AS "paramnameCrj900Col3Statisticsjson",
+		a.paramname_crj900_col4 AS "paramnameCrj900Col4",
+		a.paramname_crj900_col4_statisticsjson AS "paramnameCrj900Col4Statisticsjson",
+		a.paramname_b737_col1 AS "paramnameB737Col1",
+		a.paramname_b737_col1_statisticsjson AS "paramnameB737Col1Statisticsjson",
+		a.paramname_b737_col2 AS "paramnameB737Col2",
+		a.paramname_b737_col2_statisticsjson AS "paramnameB737Col2Statisticsjson",
+		a.paramname_b737_col3 AS "paramnameB737Col3",
+		a.paramname_b737_col3_statisticsjson AS "paramnameB737Col3Statisticsjson",
+		a.paramname_b737_col4 AS "paramnameB737Col4",
+		a.paramname_b737_col4_statisticsjson AS "paramnameB737Col4Statisticsjson",
+		a.paramname_a320_col1 AS "paramnameA320Col1",
+		a.paramname_a320_col1_statisticsjson AS "paramnameA320Col1Statisticsjson",
+		a.paramname_a320_col2 AS "paramnameA320Col2",
+		a.paramname_a320_col2_statisticsjson AS "paramnameA320Col2Statisticsjson",
+		a.paramname_a320_col3 AS "paramnameA320Col3",
+		a.paramname_a320_col3_statisticsjson AS "paramnameA320Col3Statisticsjson",
+		a.paramname_a320_col4 AS "paramnameA320Col4",
+		a.paramname_a320_col4_statisticsjson AS "paramnameA320Col4Statisticsjson",
+		a.paramname_b777_col1 AS "paramnameB777Col1",
+		a.paramname_b777_col1_statisticsjson AS "paramnameB777Col1Statisticsjson",
+		a.paramname_b777_col2 AS "paramnameB777Col2",
+		a.paramname_b777_col2_statisticsjson AS "paramnameB777Col2Statisticsjson",
+		a.paramname_b777_col3 AS "paramnameB777Col3",
+		a.paramname_b777_col3_statisticsjson AS "paramnameB777Col3Statisticsjson",
+		a.paramname_b777_col4 AS "paramnameB777Col4",
+		a.paramname_b777_col4_statisticsjson AS "paramnameB777Col4Statisticsjson",
+		a.paramname_a330_col1 AS "paramnameA330Col1",
+		a.paramname_a330_col1_statisticsjson AS "paramnameA330Col1Statisticsjson",
+		a.paramname_a330_col2 AS "paramnameA330Col2",
+		a.paramname_a330_col2_statisticsjson AS "paramnameA330Col2Statisticsjson",
+		a.paramname_a330_col3 AS "paramnameA330Col3",
+		a.paramname_a330_col3_statisticsjson AS "paramnameA330Col3Statisticsjson",
+		a.paramname_a330_col4 AS "paramnameA330Col4",
+		a.paramname_a330_col4_statisticsjson AS "paramnameA330Col4Statisticsjson"
+	</sql>
+	
+	<sql id="infoDefaultindexActypecontrastsetJoins">
+	</sql>
+    
+	<select id="get" resultType="InfoDefaultindexActypecontrastset">
+		SELECT 
+			<include refid="infoDefaultindexActypecontrastsetColumns"/>
+		FROM info_defaultindex_actypecontrastset a
+		<include refid="infoDefaultindexActypecontrastsetJoins"/>
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="findList" resultType="InfoDefaultindexActypecontrastset">
+		SELECT 
+			<include refid="infoDefaultindexActypecontrastsetColumns"/>
+		FROM info_defaultindex_actypecontrastset a
+		<include refid="infoDefaultindexActypecontrastsetJoins"/>
+		<where>
+			
+		</where>
+	</select>
+	
+	<select id="findAllList" resultType="InfoDefaultindexActypecontrastset">
+		SELECT 
+			<include refid="infoDefaultindexActypecontrastsetColumns"/>
+		FROM info_defaultindex_actypecontrastset a
+		<include refid="infoDefaultindexActypecontrastsetJoins"/>
+		<where>
+			
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+			</otherwise>
+		</choose>
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO info_defaultindex_actypecontrastset(
+			id,
+			login_admin,
+			statisticstitle,
+			choose_paramname_col1,
+			choose_paramname_col2,
+			choose_paramname_col3,
+			choose_paramname_col4,
+			jobid_crj900,
+			jobid_b737,
+			jobid_a320,
+			jobid_b777,
+			jobid_a330,
+			modelname_crj900_col1,
+			modelname_crj900_col2,
+			modelname_crj900_col3,
+			modelname_crj900_col4,
+			modelname_b737_col1,
+			modelname_b737_col2,
+			modelname_b737_col3,
+			modelname_b737_col4,
+			modelname_a320_col1,
+			modelname_a320_col2,
+			modelname_a320_col3,
+			modelname_a320_col4,
+			modelname_b777_col1,
+			modelname_b777_col2,
+			modelname_b777_col3,
+			modelname_b777_col4,
+			modelname_a330_col1,
+			modelname_a330_col2,
+			modelname_a330_col3,
+			modelname_a330_col4,
+			paramname_crj900_col1,
+			paramname_crj900_col1_statisticsjson,
+			paramname_crj900_col2,
+			paramname_crj900_col2_statisticsjson,
+			paramname_crj900_col3,
+			paramname_crj900_col3_statisticsjson,
+			paramname_crj900_col4,
+			paramname_crj900_col4_statisticsjson,
+			paramname_b737_col1,
+			paramname_b737_col1_statisticsjson,
+			paramname_b737_col2,
+			paramname_b737_col2_statisticsjson,
+			paramname_b737_col3,
+			paramname_b737_col3_statisticsjson,
+			paramname_b737_col4,
+			paramname_b737_col4_statisticsjson,
+			paramname_a320_col1,
+			paramname_a320_col1_statisticsjson,
+			paramname_a320_col2,
+			paramname_a320_col2_statisticsjson,
+			paramname_a320_col3,
+			paramname_a320_col3_statisticsjson,
+			paramname_a320_col4,
+			paramname_a320_col4_statisticsjson,
+			paramname_b777_col1,
+			paramname_b777_col1_statisticsjson,
+			paramname_b777_col2,
+			paramname_b777_col2_statisticsjson,
+			paramname_b777_col3,
+			paramname_b777_col3_statisticsjson,
+			paramname_b777_col4,
+			paramname_b777_col4_statisticsjson,
+			paramname_a330_col1,
+			paramname_a330_col1_statisticsjson,
+			paramname_a330_col2,
+			paramname_a330_col2_statisticsjson,
+			paramname_a330_col3,
+			paramname_a330_col3_statisticsjson,
+			paramname_a330_col4,
+			paramname_a330_col4_statisticsjson
+		) VALUES (
+			#{id},
+			#{loginAdmin},
+			#{statisticstitle},
+			#{chooseParamnameCol1},
+			#{chooseParamnameCol2},
+			#{chooseParamnameCol3},
+			#{chooseParamnameCol4},
+			#{jobidCrj900},
+			#{jobidB737},
+			#{jobidA320},
+			#{jobidB777},
+			#{jobidA330},
+			#{modelnameCrj900Col1},
+			#{modelnameCrj900Col2},
+			#{modelnameCrj900Col3},
+			#{modelnameCrj900Col4},
+			#{modelnameB737Col1},
+			#{modelnameB737Col2},
+			#{modelnameB737Col3},
+			#{modelnameB737Col4},
+			#{modelnameA320Col1},
+			#{modelnameA320Col2},
+			#{modelnameA320Col3},
+			#{modelnameA320Col4},
+			#{modelnameB777Col1},
+			#{modelnameB777Col2},
+			#{modelnameB777Col3},
+			#{modelnameB777Col4},
+			#{modelnameA330Col1},
+			#{modelnameA330Col2},
+			#{modelnameA330Col3},
+			#{modelnameA330Col4},
+			#{paramnameCrj900Col1},
+			#{paramnameCrj900Col1Statisticsjson},
+			#{paramnameCrj900Col2},
+			#{paramnameCrj900Col2Statisticsjson},
+			#{paramnameCrj900Col3},
+			#{paramnameCrj900Col3Statisticsjson},
+			#{paramnameCrj900Col4},
+			#{paramnameCrj900Col4Statisticsjson},
+			#{paramnameB737Col1},
+			#{paramnameB737Col1Statisticsjson},
+			#{paramnameB737Col2},
+			#{paramnameB737Col2Statisticsjson},
+			#{paramnameB737Col3},
+			#{paramnameB737Col3Statisticsjson},
+			#{paramnameB737Col4},
+			#{paramnameB737Col4Statisticsjson},
+			#{paramnameA320Col1},
+			#{paramnameA320Col1Statisticsjson},
+			#{paramnameA320Col2},
+			#{paramnameA320Col2Statisticsjson},
+			#{paramnameA320Col3},
+			#{paramnameA320Col3Statisticsjson},
+			#{paramnameA320Col4},
+			#{paramnameA320Col4Statisticsjson},
+			#{paramnameB777Col1},
+			#{paramnameB777Col1Statisticsjson},
+			#{paramnameB777Col2},
+			#{paramnameB777Col2Statisticsjson},
+			#{paramnameB777Col3},
+			#{paramnameB777Col3Statisticsjson},
+			#{paramnameB777Col4},
+			#{paramnameB777Col4Statisticsjson},
+			#{paramnameA330Col1},
+			#{paramnameA330Col1Statisticsjson},
+			#{paramnameA330Col2},
+			#{paramnameA330Col2Statisticsjson},
+			#{paramnameA330Col3},
+			#{paramnameA330Col3Statisticsjson},
+			#{paramnameA330Col4},
+			#{paramnameA330Col4Statisticsjson}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE info_defaultindex_actypecontrastset SET 	
+			login_admin = #{loginAdmin},
+			statisticstitle = #{statisticstitle},
+			choose_paramname_col1 = #{chooseParamnameCol1},
+			choose_paramname_col2 = #{chooseParamnameCol2},
+			choose_paramname_col3 = #{chooseParamnameCol3},
+			choose_paramname_col4 = #{chooseParamnameCol4},
+			jobid_crj900 = #{jobidCrj900},
+			jobid_b737 = #{jobidB737},
+			jobid_a320 = #{jobidA320},
+			jobid_b777 = #{jobidB777},
+			jobid_a330 = #{jobidA330},
+			modelname_crj900_col1 = #{modelnameCrj900Col1},
+			modelname_crj900_col2 = #{modelnameCrj900Col2},
+			modelname_crj900_col3 = #{modelnameCrj900Col3},
+			modelname_crj900_col4 = #{modelnameCrj900Col4},
+			modelname_b737_col1 = #{modelnameB737Col1},
+			modelname_b737_col2 = #{modelnameB737Col2},
+			modelname_b737_col3 = #{modelnameB737Col3},
+			modelname_b737_col4 = #{modelnameB737Col4},
+			modelname_a320_col1 = #{modelnameA320Col1},
+			modelname_a320_col2 = #{modelnameA320Col2},
+			modelname_a320_col3 = #{modelnameA320Col3},
+			modelname_a320_col4 = #{modelnameA320Col4},
+			modelname_b777_col1 = #{modelnameB777Col1},
+			modelname_b777_col2 = #{modelnameB777Col2},
+			modelname_b777_col3 = #{modelnameB777Col3},
+			modelname_b777_col4 = #{modelnameB777Col4},
+			modelname_a330_col1 = #{modelnameA330Col1},
+			modelname_a330_col2 = #{modelnameA330Col2},
+			modelname_a330_col3 = #{modelnameA330Col3},
+			modelname_a330_col4 = #{modelnameA330Col4},
+			paramname_crj900_col1 = #{paramnameCrj900Col1},
+			paramname_crj900_col1_statisticsjson = #{paramnameCrj900Col1Statisticsjson},
+			paramname_crj900_col2 = #{paramnameCrj900Col2},
+			paramname_crj900_col2_statisticsjson = #{paramnameCrj900Col2Statisticsjson},
+			paramname_crj900_col3 = #{paramnameCrj900Col3},
+			paramname_crj900_col3_statisticsjson = #{paramnameCrj900Col3Statisticsjson},
+			paramname_crj900_col4 = #{paramnameCrj900Col4},
+			paramname_crj900_col4_statisticsjson = #{paramnameCrj900Col4Statisticsjson},
+			paramname_b737_col1 = #{paramnameB737Col1},
+			paramname_b737_col1_statisticsjson = #{paramnameB737Col1Statisticsjson},
+			paramname_b737_col2 = #{paramnameB737Col2},
+			paramname_b737_col2_statisticsjson = #{paramnameB737Col2Statisticsjson},
+			paramname_b737_col3 = #{paramnameB737Col3},
+			paramname_b737_col3_statisticsjson = #{paramnameB737Col3Statisticsjson},
+			paramname_b737_col4 = #{paramnameB737Col4},
+			paramname_b737_col4_statisticsjson = #{paramnameB737Col4Statisticsjson},
+			paramname_a320_col1 = #{paramnameA320Col1},
+			paramname_a320_col1_statisticsjson = #{paramnameA320Col1Statisticsjson},
+			paramname_a320_col2 = #{paramnameA320Col2},
+			paramname_a320_col2_statisticsjson = #{paramnameA320Col2Statisticsjson},
+			paramname_a320_col3 = #{paramnameA320Col3},
+			paramname_a320_col3_statisticsjson = #{paramnameA320Col3Statisticsjson},
+			paramname_a320_col4 = #{paramnameA320Col4},
+			paramname_a320_col4_statisticsjson = #{paramnameA320Col4Statisticsjson},
+			paramname_b777_col1 = #{paramnameB777Col1},
+			paramname_b777_col1_statisticsjson = #{paramnameB777Col1Statisticsjson},
+			paramname_b777_col2 = #{paramnameB777Col2},
+			paramname_b777_col2_statisticsjson = #{paramnameB777Col2Statisticsjson},
+			paramname_b777_col3 = #{paramnameB777Col3},
+			paramname_b777_col3_statisticsjson = #{paramnameB777Col3Statisticsjson},
+			paramname_b777_col4 = #{paramnameB777Col4},
+			paramname_b777_col4_statisticsjson = #{paramnameB777Col4Statisticsjson},
+			paramname_a330_col1 = #{paramnameA330Col1},
+			paramname_a330_col1_statisticsjson = #{paramnameA330Col1Statisticsjson},
+			paramname_a330_col2 = #{paramnameA330Col2},
+			paramname_a330_col2_statisticsjson = #{paramnameA330Col2Statisticsjson},
+			paramname_a330_col3 = #{paramnameA330Col3},
+			paramname_a330_col3_statisticsjson = #{paramnameA330Col3Statisticsjson},
+			paramname_a330_col4 = #{paramnameA330Col4},
+			paramname_a330_col4_statisticsjson = #{paramnameA330Col4Statisticsjson}
+		WHERE id = #{id}
+	</update>
+	
+	<update id="delete">
+		DELETE FROM info_defaultindex_actypecontrastset
+		WHERE id = #{id}
+	</update>
+	
+	
+	<!-- 查询查询机型数据对比设置属性-->
+	<select id="findActypecontrastSetData" resultType="java.util.Map">
+		SELECT 
+			<include refid="infoDefaultindexActypecontrastsetColumns"/>
+		FROM info_defaultindex_actypecontrastset a
+		
+	</select>
+</mapper>

infosouth-arj21/src/main/resources/mapper/InfoDutyScheduleMapper.xml

@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.infosouth.arj21.mapper.InfoDutyScheduleMapper">
+    
+    <resultMap type="InfoDutySchedule" id="InfoDutyScheduleResult">
+        <result property="id"    column="id"    />
+        <result property="jobName"    column="job_name"    />
+        <result property="modelName"    column="model_name"    />
+        <result property="acType"    column="ac_type"    />
+        <result property="acReg"    column="ac_reg"    />
+        <result property="versionId"    column="version_id"    />
+        <result property="startDate"    column="start_date"    />
+        <result property="endDate"    column="end_date"    />
+        <result property="jobDesc"    column="job_desc"    />
+        <result property="isExcute"    column="is_excute"    />
+        <result property="jobStatus"    column="job_status"    />
+        <result property="excuteFreq"    column="excute_freq"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateDate"    column="update_date"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="jobConf"    column="job_conf"    />
+        <result property="executeStatus"    column="execute_status"    />
+    </resultMap>
+
+    <sql id="selectInfoDutyScheduleVo">
+        select id, job_name, model_name, ac_type, ac_reg, version_id, start_date, end_date, job_desc, is_excute, job_status, excute_freq, create_by, create_date, update_by, update_date, remarks, del_flag, job_conf, execute_status from info_duty_schedule
+    </sql>
+
+    <select id="selectInfoDutyScheduleList" parameterType="InfoDutySchedule" resultMap="InfoDutyScheduleResult">
+        <include refid="selectInfoDutyScheduleVo"/>
+        <where>  
+            <if test="jobName != null  and jobName != ''"> and job_name like concat('%', #{jobName}, '%')</if>
+            <if test="modelName != null  and modelName != ''"> and model_name like concat('%', #{modelName}, '%')</if>
+            <if test="acType != null  and acType != ''"> and ac_type = #{acType}</if>
+            <if test="acReg != null  and acReg != ''"> and ac_reg = #{acReg}</if>
+            <if test="versionId != null "> and version_id = #{versionId}</if>
+            <if test="startDate != null "> and start_date = #{startDate}</if>
+            <if test="endDate != null "> and end_date = #{endDate}</if>
+            <if test="jobDesc != null  and jobDesc != ''"> and job_desc = #{jobDesc}</if>
+            <if test="isExcute != null "> and is_excute = #{isExcute}</if>
+            <if test="jobStatus != null  and jobStatus != ''"> and job_status = #{jobStatus}</if>
+            <if test="excuteFreq != null  and excuteFreq != ''"> and excute_freq = #{excuteFreq}</if>
+            <if test="createDate != null "> and create_date = #{createDate}</if>
+            <if test="updateDate != null "> and update_date = #{updateDate}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="jobConf != null  and jobConf != ''"> and job_conf = #{jobConf}</if>
+            <if test="executeStatus != null "> and execute_status = #{executeStatus}</if>
+        </where>
+    </select>
+    
+    <select id="selectInfoDutyScheduleById" parameterType="String" resultMap="InfoDutyScheduleResult">
+        <include refid="selectInfoDutyScheduleVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertInfoDutySchedule" parameterType="InfoDutySchedule">
+        insert into info_duty_schedule
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null  and id != ''">id,</if>
+            <if test="jobName != null  and jobName != ''">job_name,</if>
+            <if test="modelName != null  and modelName != ''">model_name,</if>
+            <if test="acType != null  and acType != ''">ac_type,</if>
+            <if test="acReg != null  and acReg != ''">ac_reg,</if>
+            <if test="versionId != null ">version_id,</if>
+            <if test="startDate != null ">start_date,</if>
+            <if test="endDate != null ">end_date,</if>
+            <if test="jobDesc != null  and jobDesc != ''">job_desc,</if>
+            <if test="isExcute != null ">is_excute,</if>
+            <if test="jobStatus != null  and jobStatus != ''">job_status,</if>
+            <if test="excuteFreq != null  and excuteFreq != ''">excute_freq,</if>
+            <if test="createBy != null  and createBy != ''">create_by,</if>
+            <if test="createDate != null ">create_date,</if>
+            <if test="updateBy != null  and updateBy != ''">update_by,</if>
+            <if test="updateDate != null ">update_date,</if>
+            <if test="remarks != null  and remarks != ''">remarks,</if>
+            <if test="delFlag != null  and delFlag != ''">del_flag,</if>
+            <if test="jobConf != null  and jobConf != ''">job_conf,</if>
+            <if test="executeStatus != null ">execute_status,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null  and id != ''">#{id},</if>
+            <if test="jobName != null  and jobName != ''">#{jobName},</if>
+            <if test="modelName != null  and modelName != ''">#{modelName},</if>
+            <if test="acType != null  and acType != ''">#{acType},</if>
+            <if test="acReg != null  and acReg != ''">#{acReg},</if>
+            <if test="versionId != null ">#{versionId},</if>
+            <if test="startDate != null ">#{startDate},</if>
+            <if test="endDate != null ">#{endDate},</if>
+            <if test="jobDesc != null  and jobDesc != ''">#{jobDesc},</if>
+            <if test="isExcute != null ">#{isExcute},</if>
+            <if test="jobStatus != null  and jobStatus != ''">#{jobStatus},</if>
+            <if test="excuteFreq != null  and excuteFreq != ''">#{excuteFreq},</if>
+            <if test="createBy != null  and createBy != ''">#{createBy},</if>
+            <if test="createDate != null ">#{createDate},</if>
+            <if test="updateBy != null  and updateBy != ''">#{updateBy},</if>
+            <if test="updateDate != null ">#{updateDate},</if>
+            <if test="remarks != null  and remarks != ''">#{remarks},</if>
+            <if test="delFlag != null  and delFlag != ''">#{delFlag},</if>
+            <if test="jobConf != null  and jobConf != ''">#{jobConf},</if>
+            <if test="executeStatus != null ">#{executeStatus},</if>
+         </trim>
+    </insert>
+
+    <update id="updateInfoDutySchedule" parameterType="InfoDutySchedule">
+        update info_duty_schedule
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="jobName != null  and jobName != ''">job_name = #{jobName},</if>
+            <if test="modelName != null  and modelName != ''">model_name = #{modelName},</if>
+            <if test="acType != null  and acType != ''">ac_type = #{acType},</if>
+            <if test="acReg != null  and acReg != ''">ac_reg = #{acReg},</if>
+            <if test="versionId != null ">version_id = #{versionId},</if>
+            <if test="startDate != null ">start_date = #{startDate},</if>
+            <if test="endDate != null ">end_date = #{endDate},</if>
+            <if test="jobDesc != null  and jobDesc != ''">job_desc = #{jobDesc},</if>
+            <if test="isExcute != null ">is_excute = #{isExcute},</if>
+            <if test="jobStatus != null  and jobStatus != ''">job_status = #{jobStatus},</if>
+            <if test="excuteFreq != null  and excuteFreq != ''">excute_freq = #{excuteFreq},</if>
+            <if test="createBy != null  and createBy != ''">create_by = #{createBy},</if>
+            <if test="createDate != null ">create_date = #{createDate},</if>
+            <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateDate != null ">update_date = #{updateDate},</if>
+            <if test="remarks != null  and remarks != ''">remarks = #{remarks},</if>
+            <if test="delFlag != null  and delFlag != ''">del_flag = #{delFlag},</if>
+            <if test="jobConf != null  and jobConf != ''">job_conf = #{jobConf},</if>
+            <if test="executeStatus != null ">execute_status = #{executeStatus},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteInfoDutyScheduleById" parameterType="String">
+        delete from info_duty_schedule where id = #{id}
+    </delete>
+
+    <delete id="deleteInfoDutyScheduleByIds" parameterType="String">
+        delete from info_duty_schedule where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+    <!-- **************查询任务数量************* -->
+	<select id="findJobCount" resultType="String">
+		SELECT 
+			count(a.id) as jobCount
+		FROM info_duty_schedule a
+		<where>
+			a.del_flag = 0
+		</where>		
+	</select>
+	
+	<!-- 根据机型，查询匹配的任务 -->
+	<select id="findInfoDutyScheduleMapList" resultType="java.util.Map">
+		SELECT 
+			a.id AS "id",
+			a.job_name AS "jobName",
+			a.ac_type AS "acType"
+		FROM info_duty_schedule a
+		<where>
+			a.del_flag = 0
+			AND
+			a.ac_type=#{acType}
+		</where>	
+		ORDER BY a.create_by,a.update_date DESC
+	</select>
+	
+    
+</mapper>

infosouth-arj21/src/main/resources/mapper/InfoFlightMapper.xml

@@ -24,12 +24,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="delFlag"    column="del_flag"    />
     </resultMap>
 
+
+	<sql id="infoFlightColumns">
+		a.id AS "id",
+		a.fl_date AS "fl_date",
+		a.fl_no AS "fl_no",
+		<!-- a.arn AS "arId", -->
+		c.ac_reg AS "arn",
+		<!-- a.ac_type AS "acTypeId", -->
+		d.ac_tpye AS "ac_type",
+		a.pod AS "pod",
+		a.poa AS "poa",
+		a.airline AS "airline",
+		a.csv_path AS "csv_path",
+		a.csv_name AS "csv_name",
+		a.create_by AS "createBy.id",
+		a.info_resource_id AS "info_resource_id",
+		a.create_date AS "create_date",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "update_date",
+		a.remarks AS "remarks",
+		a.del_flag AS "del_flag"
+	</sql>
+	<sql id="infoFlightJoins">
+		left join info_resource b 
+		on a.info_resource_id = b.id 
+		left join info_aircraft c
+		on a.arn = c.id
+		left join info_ac_type d
+		on a.ac_type = d.id
+	</sql>
+
     <sql id="selectInfoFlightVo">
         select id, fl_date, fl_no, arn, ac_type, pod, poa, airline, csv_path, csv_name, info_resource_id, create_by, create_date, update_by, update_date, remarks, del_flag from info_flight
     </sql>
 
     <select id="selectInfoFlightList" parameterType="InfoFlight" resultMap="InfoFlightResult">
-        <include refid="selectInfoFlightVo"/>
+       	select
+        <include refid="infoFlightColumns"/>
+        from info_flight a
+      		left join info_aircraft c
+			on a.arn = c.id
+			left join info_ac_type d
+			on a.ac_type = d.id
         <where>  
             <if test="flDate != null "> and fl_date = #{flDate}</if>
             <if test="flNo != null  and flNo != ''"> and fl_no = #{flNo}</if>
@@ -128,4 +165,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
     
+    <!-- 查询info_flight 表数量 -->
+	<select id="findFlightCount" resultType="String">
+		select 
+		count(a.id) as qarCount
+		from info_flight a
+		where 1=1
+		<if test="del_flag != null and arn !='' ">
+		and a.del_flag = #{DEL_FLAG_DELETE}
+		</if>		
+	</select>
+    
+    <select id="getAcTypeByArn" resultType="String">
+		SELECT 
+		ac_tpye as acType	
+		FROM info_ac_type a left join info_aircraft b on a.id=b.info_ac_type_id
+		where 
+		b.ac_reg=#{arn}
+		and a.del_flag=0
+		and b.del_flag=0
+	</select>
+	
+	<select id="csvExist" resultType="int">
+		SELECT 
+			COUNT(1)
+		FROM info_flight a
+		<include refid="infoFlightJoins"/>
+		WHERE a.csv_name = #{csvName}
+		and a.del_flag=0
+		and b.del_flag=0
+	</select>
+	
+	<select id="getIdByCsvName" resultType="String">
+		SELECT 
+			<include refid="infoFlightColumns"/>,
+			c.ac_reg AS "arn"
+		FROM info_flight a
+		<include refid="infoFlightJoins"/>
+		WHERE a.csv_name = #{csvName}
+		limit 1
+	</select>
+    
 </mapper>

infosouth-arj21/src/main/resources/mapper/InfoHeaderParamsMapper.xml

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.infosouth.arj21.mapper.InfoHeaderParamsMapper">
+    
+	<sql id="infoHeaderParamsColumns">
+		a.id AS "id",
+		a.version_id AS "versionId",
+		a.header_params AS "headerParams",
+		a.ref_params AS "refParams",
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.remarks AS "remarks",
+		a.del_flag AS "delFlag"
+	</sql>
+	
+	<sql id="infoHeaderParamsJoins">
+		
+	</sql>
+    
+	<select id="get" resultType="InfoHeaderParams">
+		SELECT 
+			<include refid="infoHeaderParamsColumns"/>
+		FROM info_header_params a
+		<include refid="infoHeaderParamsJoins"/>
+		WHERE a.id = #{id}
+	</select>
+	
+	<select id="getByVersionId" resultType="InfoHeaderParams">
+		SELECT 
+			<include refid="infoHeaderParamsColumns"/>
+		FROM info_header_params a
+		<include refid="infoHeaderParamsJoins"/>
+		WHERE a.version_id = #{versionId}
+	</select>
+	
+	<select id="findList" resultType="InfoHeaderParams">
+		SELECT 
+			<include refid="infoHeaderParamsColumns"/>
+		FROM info_header_params a
+		<include refid="infoHeaderParamsJoins"/>
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+		</where>
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="findAllList" resultType="InfoHeaderParams">
+		SELECT 
+			<include refid="infoHeaderParamsColumns"/>
+		FROM info_header_params a
+		<include refid="infoHeaderParamsJoins"/>
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL}
+		</where>		
+		<choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
+	
+	<select id="checkRefParam" resultType="String">
+		SELECT #{refParam} param from info_header_params where version_id = #{versionId} and 
+		(
+			find_in_set(#{refParam}, header_params)
+			AND NOT find_in_set(#{refParam}, ref_params)
+		)
+	</select>
+	
+	<insert id="insert">
+		INSERT INTO info_header_params(
+			id,
+			version_id,
+			header_params,
+			ref_params,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag
+		) VALUES (
+			#{id},
+			#{versionId},
+			#{headerParams},
+			'',
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag}
+		)
+	</insert>
+	
+	<update id="update">
+		UPDATE info_header_params SET 	
+			version_id = #{versionId},
+			header_params = #{headerParams},
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			remarks = #{remarks}
+		WHERE id = #{id}
+	</update>
+	
+	
+	
+	<update id="addRefParams">
+		UPDATE info_header_params SET 	
+			ref_params = concat_ws(',',ref_params,#{refParams})
+		WHERE version_id = #{versionId}
+	</update>
+	
+	<update id="delete">
+		UPDATE info_header_params SET 
+			del_flag = #{DEL_FLAG_DELETE}
+		WHERE id = #{id}
+	</update>
+	
+</mapper>

infosouth-arj21/src/main/resources/mapper/InfoImexportLogMapper.xml

@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.infosouth.arj21.mapper.InfoImexportLogMapper">
+    
+    <resultMap type="InfoImexportLog" id="InfoImexportLogResult">
+        <result property="id"    column="id"    />
+        <result property="flDate"    column="fl_date"    />
+        <result property="flNo"    column="fl_no"    />
+        <result property="arn"    column="arn"    />
+        <result property="acType"    column="ac_type"    />
+        <result property="pod"    column="pod"    />
+        <result property="poa"    column="poa"    />
+        <result property="airline"    column="airline"    />
+        <result property="csvPath"    column="csv_path"    />
+        <result property="csvName"    column="csv_name"    />
+        <result property="operateBy"    column="operate_by"    />
+        <result property="operateDate"    column="operate_date"    />
+        <result property="hostIp"    column="host_ip"    />
+        <result property="fileSize"    column="file_size"    />
+        <result property="operateType"    column="operate_type"    />
+        <result property="isSucce"    column="is_succe"    />
+        <result property="failType"    column="fail_type"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateDate"    column="update_date"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectInfoImexportLogVo">
+        select id, fl_date, fl_no, arn, ac_type, pod, poa, airline, csv_path, csv_name, operate_by, operate_date, host_ip, file_size, operate_type, is_succe, fail_type, create_by, create_date, update_by, update_date, remarks, del_flag from info_imexport_log
+    </sql>
+
+    <select id="selectInfoImexportLogList" parameterType="InfoImexportLog" resultMap="InfoImexportLogResult">
+        <include refid="selectInfoImexportLogVo"/>
+        <where>  
+            <if test="id != null  and id != ''"> and id = #{id}</if>
+            <if test="flDate != null "> and fl_date = #{flDate}</if>
+            <if test="arn != null  and arn != ''"> and arn = #{arn}</if>
+            <if test="acType != null  and acType != ''"> and ac_type = #{acType}</if>
+            <if test="pod != null  and pod != ''"> and pod = #{pod}</if>
+            <if test="poa != null  and poa != ''"> and poa = #{poa}</if>
+            <if test="airline != null  and airline != ''"> and airline = #{airline}</if>
+            <if test="csvName != null  and csvName != ''"> and csv_name like concat('%', #{csvName}, '%')</if>
+            <if test="operateBy != null  and operateBy != ''"> and operate_by = #{operateBy}</if>
+            <if test="operateDate != null "> and operate_date = #{operateDate}</if>
+            <if test="hostIp != null  and hostIp != ''"> and host_ip = #{hostIp}</if>
+            <if test="fileSize != null "> and file_size = #{fileSize}</if>
+            <if test="operateType != null  and operateType != ''"> and operate_type = #{operateType}</if>
+            <if test="isSucce != null  and isSucce != ''"> and is_succe = #{isSucce}</if>
+            <if test="failType != null  and failType != ''"> and fail_type = #{failType}</if>
+        </where>
+    </select>
+    
+    <select id="selectInfoImexportLogById" parameterType="String" resultMap="InfoImexportLogResult">
+        <include refid="selectInfoImexportLogVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertInfoImexportLog" parameterType="InfoImexportLog">
+        insert into info_imexport_log
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null  and id != ''">id,</if>
+            <if test="flDate != null ">fl_date,</if>
+            <if test="flNo != null  and flNo != ''">fl_no,</if>
+            <if test="arn != null  and arn != ''">arn,</if>
+            <if test="acType != null  and acType != ''">ac_type,</if>
+            <if test="pod != null  and pod != ''">pod,</if>
+            <if test="poa != null  and poa != ''">poa,</if>
+            <if test="airline != null  and airline != ''">airline,</if>
+            <if test="csvPath != null  and csvPath != ''">csv_path,</if>
+            <if test="csvName != null  and csvName != ''">csv_name,</if>
+            <if test="operateBy != null  and operateBy != ''">operate_by,</if>
+            <if test="operateDate != null ">operate_date,</if>
+            <if test="hostIp != null  and hostIp != ''">host_ip,</if>
+            <if test="fileSize != null ">file_size,</if>
+            <if test="operateType != null  and operateType != ''">operate_type,</if>
+            <if test="isSucce != null  and isSucce != ''">is_succe,</if>
+            <if test="failType != null  and failType != ''">fail_type,</if>
+            <if test="createBy != null  and createBy != ''">create_by,</if>
+            <if test="createDate != null ">create_date,</if>
+            <if test="updateBy != null  and updateBy != ''">update_by,</if>
+            <if test="updateDate != null ">update_date,</if>
+            <if test="remarks != null  and remarks != ''">remarks,</if>
+            <if test="delFlag != null  and delFlag != ''">del_flag,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null  and id != ''">#{id},</if>
+            <if test="flDate != null ">#{flDate},</if>
+            <if test="flNo != null  and flNo != ''">#{flNo},</if>
+            <if test="arn != null  and arn != ''">#{arn},</if>
+            <if test="acType != null  and acType != ''">#{acType},</if>
+            <if test="pod != null  and pod != ''">#{pod},</if>
+            <if test="poa != null  and poa != ''">#{poa},</if>
+            <if test="airline != null  and airline != ''">#{airline},</if>
+            <if test="csvPath != null  and csvPath != ''">#{csvPath},</if>
+            <if test="csvName != null  and csvName != ''">#{csvName},</if>
+            <if test="operateBy != null  and operateBy != ''">#{operateBy},</if>
+            <if test="operateDate != null ">#{operateDate},</if>
+            <if test="hostIp != null  and hostIp != ''">#{hostIp},</if>
+            <if test="fileSize != null ">#{fileSize},</if>
+            <if test="operateType != null  and operateType != ''">#{operateType},</if>
+            <if test="isSucce != null  and isSucce != ''">#{isSucce},</if>
+            <if test="failType != null  and failType != ''">#{failType},</if>
+            <if test="createBy != null  and createBy != ''">#{createBy},</if>
+            <if test="createDate != null ">#{createDate},</if>
+            <if test="updateBy != null  and updateBy != ''">#{updateBy},</if>
+            <if test="updateDate != null ">#{updateDate},</if>
+            <if test="remarks != null  and remarks != ''">#{remarks},</if>
+            <if test="delFlag != null  and delFlag != ''">#{delFlag},</if>
+         </trim>
+    </insert>
+
+    <update id="updateInfoImexportLog" parameterType="InfoImexportLog">
+        update info_imexport_log
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="flDate != null ">fl_date = #{flDate},</if>
+            <if test="flNo != null  and flNo != ''">fl_no = #{flNo},</if>
+            <if test="arn != null  and arn != ''">arn = #{arn},</if>
+            <if test="acType != null  and acType != ''">ac_type = #{acType},</if>
+            <if test="pod != null  and pod != ''">pod = #{pod},</if>
+            <if test="poa != null  and poa != ''">poa = #{poa},</if>
+            <if test="airline != null  and airline != ''">airline = #{airline},</if>
+            <if test="csvPath != null  and csvPath != ''">csv_path = #{csvPath},</if>
+            <if test="csvName != null  and csvName != ''">csv_name = #{csvName},</if>
+            <if test="operateBy != null  and operateBy != ''">operate_by = #{operateBy},</if>
+            <if test="operateDate != null ">operate_date = #{operateDate},</if>
+            <if test="hostIp != null  and hostIp != ''">host_ip = #{hostIp},</if>
+            <if test="fileSize != null ">file_size = #{fileSize},</if>
+            <if test="operateType != null  and operateType != ''">operate_type = #{operateType},</if>
+            <if test="isSucce != null  and isSucce != ''">is_succe = #{isSucce},</if>
+            <if test="failType != null  and failType != ''">fail_type = #{failType},</if>
+            <if test="createBy != null  and createBy != ''">create_by = #{createBy},</if>
+            <if test="createDate != null ">create_date = #{createDate},</if>
+            <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateDate != null ">update_date = #{updateDate},</if>
+            <if test="remarks != null  and remarks != ''">remarks = #{remarks},</if>
+            <if test="delFlag != null  and delFlag != ''">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteInfoImexportLogById" parameterType="String">
+        delete from info_imexport_log where id = #{id}
+    </delete>
+
+    <delete id="deleteInfoImexportLogByIds" parameterType="String">
+        delete from info_imexport_log where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+</mapper>

infosouth-arj21/src/main/resources/mapper/InfoParameterComputedMapper.xml

@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.infosouth.arj21.mapper.InfoParameterComputedMapper">
+    
+    <resultMap type="InfoParameterComputed" id="InfoParameterComputedResult">
+        <result property="id"    column="id"    />
+        <result property="prmId"    column="prm_id"    />
+        <result property="infoVersion"    column="info_version"    />
+        <result property="infoType"    column="info_type"    />
+        <result property="prmName"    column="prm_name"    />
+        <result property="prmDesc"    column="prm_desc"    />
+        <result property="prmLanguage"    column="prm_language"    />
+        <result property="scriptCode"    column="script_code"    />
+        <result property="pythonCode"    column="python_code"    />
+        <result property="order"    column="order"    />
+        <result property="preferenceParams"    column="preference_params"    />
+        <result property="exportParams"    column="export_params"    />
+        <result property="exportFrom"    column="export_from"    />
+        <result property="exportTo"    column="export_to"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateDate"    column="update_date"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectInfoParameterComputedVo">
+        select id, prm_id, info_version, info_type, prm_name, prm_desc, prm_language, script_code, python_code, order, preference_params, export_params, export_from, export_to, create_by, create_date, update_by, update_date, remarks, del_flag from info_parameter_computed
+    </sql>
+
+    <select id="selectInfoParameterComputedList" parameterType="InfoParameterComputed" resultMap="InfoParameterComputedResult">
+        <include refid="selectInfoParameterComputedVo"/>
+        <where>  
+            <if test="infoVersion != null  and infoVersion != ''"> and info_version = #{infoVersion}</if>
+            <if test="prmName != null  and prmName != ''"> and prm_name like concat('%', #{prmName}, '%')</if>
+            <if test="prmDesc != null  and prmDesc != ''"> and prm_desc = #{prmDesc}</if>
+        </where>
+    </select>
+    
+    <select id="selectInfoParameterComputedById" parameterType="String" resultMap="InfoParameterComputedResult">
+        <include refid="selectInfoParameterComputedVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertInfoParameterComputed" parameterType="InfoParameterComputed">
+        insert into info_parameter_computed
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null  and id != ''">id,</if>
+            <if test="prmId != null  and prmId != ''">prm_id,</if>
+            <if test="infoVersion != null  and infoVersion != ''">info_version,</if>
+            <if test="infoType != null ">info_type,</if>
+            <if test="prmName != null  and prmName != ''">prm_name,</if>
+            <if test="prmDesc != null  and prmDesc != ''">prm_desc,</if>
+            <if test="prmLanguage != null  and prmLanguage != ''">prm_language,</if>
+            <if test="scriptCode != null  and scriptCode != ''">script_code,</if>
+            <if test="pythonCode != null  and pythonCode != ''">python_code,</if>
+            <if test="order != null ">order,</if>
+            <if test="preferenceParams != null  and preferenceParams != ''">preference_params,</if>
+            <if test="exportParams != null  and exportParams != ''">export_params,</if>
+            <if test="exportFrom != null ">export_from,</if>
+            <if test="exportTo != null ">export_to,</if>
+            <if test="createBy != null  and createBy != ''">create_by,</if>
+            <if test="createDate != null ">create_date,</if>
+            <if test="updateBy != null  and updateBy != ''">update_by,</if>
+            <if test="updateDate != null ">update_date,</if>
+            <if test="remarks != null  and remarks != ''">remarks,</if>
+            <if test="delFlag != null  and delFlag != ''">del_flag,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null  and id != ''">#{id},</if>
+            <if test="prmId != null  and prmId != ''">#{prmId},</if>
+            <if test="infoVersion != null  and infoVersion != ''">#{infoVersion},</if>
+            <if test="infoType != null ">#{infoType},</if>
+            <if test="prmName != null  and prmName != ''">#{prmName},</if>
+            <if test="prmDesc != null  and prmDesc != ''">#{prmDesc},</if>
+            <if test="prmLanguage != null  and prmLanguage != ''">#{prmLanguage},</if>
+            <if test="scriptCode != null  and scriptCode != ''">#{scriptCode},</if>
+            <if test="pythonCode != null  and pythonCode != ''">#{pythonCode},</if>
+            <if test="order != null ">#{order},</if>
+            <if test="preferenceParams != null  and preferenceParams != ''">#{preferenceParams},</if>
+            <if test="exportParams != null  and exportParams != ''">#{exportParams},</if>
+            <if test="exportFrom != null ">#{exportFrom},</if>
+            <if test="exportTo != null ">#{exportTo},</if>
+            <if test="createBy != null  and createBy != ''">#{createBy},</if>
+            <if test="createDate != null ">#{createDate},</if>
+            <if test="updateBy != null  and updateBy != ''">#{updateBy},</if>
+            <if test="updateDate != null ">#{updateDate},</if>
+            <if test="remarks != null  and remarks != ''">#{remarks},</if>
+            <if test="delFlag != null  and delFlag != ''">#{delFlag},</if>
+         </trim>
+    </insert>
+
+    <update id="updateInfoParameterComputed" parameterType="InfoParameterComputed">
+        update info_parameter_computed
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="prmId != null  and prmId != ''">prm_id = #{prmId},</if>
+            <if test="infoVersion != null  and infoVersion != ''">info_version = #{infoVersion},</if>
+            <if test="infoType != null ">info_type = #{infoType},</if>
+            <if test="prmName != null  and prmName != ''">prm_name = #{prmName},</if>
+            <if test="prmDesc != null  and prmDesc != ''">prm_desc = #{prmDesc},</if>
+            <if test="prmLanguage != null  and prmLanguage != ''">prm_language = #{prmLanguage},</if>
+            <if test="scriptCode != null  and scriptCode != ''">script_code = #{scriptCode},</if>
+            <if test="pythonCode != null  and pythonCode != ''">python_code = #{pythonCode},</if>
+            <if test="order != null ">order = #{order},</if>
+            <if test="preferenceParams != null  and preferenceParams != ''">preference_params = #{preferenceParams},</if>
+            <if test="exportParams != null  and exportParams != ''">export_params = #{exportParams},</if>
+            <if test="exportFrom != null ">export_from = #{exportFrom},</if>
+            <if test="exportTo != null ">export_to = #{exportTo},</if>
+            <if test="createBy != null  and createBy != ''">create_by = #{createBy},</if>
+            <if test="createDate != null ">create_date = #{createDate},</if>
+            <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateDate != null ">update_date = #{updateDate},</if>
+            <if test="remarks != null  and remarks != ''">remarks = #{remarks},</if>
+            <if test="delFlag != null  and delFlag != ''">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteInfoParameterComputedById" parameterType="String">
+        delete from info_parameter_computed where id = #{id}
+    </delete>
+
+    <delete id="deleteInfoParameterComputedByIds" parameterType="String">
+        delete from info_parameter_computed where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+</mapper>