Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	关键字日志转http url配置功能完成

src/main/java/com/nis/util/ConfigDictUtils.java

@@ -12,10 +12,13 @@ import com.nis.domain.SysDataDictionaryItem;
 import com.nis.domain.SysDataDictionaryName;
 import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.basics.SysDictInfo;
+import com.nis.domain.configuration.BaseStringCfg;
+import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.web.dao.SysDictDao;
 import com.nis.web.dao.basics.ServiceDictInfoDao;
 import com.nis.web.dao.basics.SysDictInfoDao;
+import com.nis.web.dao.configuration.WebsiteCfgDao;
 import com.nis.web.dao.specific.SpecificServiceCfgDao;
 import com.nis.web.service.SpringContextHolder;
 
@@ -33,6 +36,7 @@ public class ConfigDictUtils {
 	private final static ServiceDictInfoDao serviceDictInfoDao = SpringContextHolder.getBean(ServiceDictInfoDao.class);
 	private final static SysDictInfoDao sysDictInfoDao = SpringContextHolder.getBean(SysDictInfoDao.class);
 	private final static SpecificServiceCfgDao specificServiceCfgDao = SpringContextHolder.getBean(SpecificServiceCfgDao.class);
+	private final static WebsiteCfgDao websiteCfgDao = SpringContextHolder.getBean(WebsiteCfgDao.class);
 
 	/**
 	 * 根据主键查询配置详情
@@ -149,5 +153,28 @@ public class ConfigDictUtils {
 		}
 		return intArr;
 	}
-	
+	/**
+	 * 根据compileId获取配置内容
+	 * @param compileId
+	 * @return
+	 */
+	public static String getHttpBodyKeyword(Integer compileId ) {
+		String httpBodyKeyword="";
+		try {
+			if(!StringUtil.isEmpty(compileId)){
+				CfgIndexInfo entity=new CfgIndexInfo();
+				entity.setCompileId(compileId);
+				List httpBodyList=websiteCfgDao.getHttpBodyList(entity);
+				if(!StringUtil.isEmpty(httpBodyList)){
+					BaseStringCfg cfg=(BaseStringCfg)httpBodyList.get(0);
+					httpBodyKeyword=StringUtil.isEmpty(cfg.getCfgKeywords()) ? "":cfg.getCfgKeywords()
+													.replace(Constants.KEYWORD_EXPR, " ");
+				}
+			}
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return httpBodyKeyword;
+	}
 }

src/main/java/com/nis/util/LogUtils.java

@@ -67,7 +67,26 @@ public class LogUtils {
 			}else{
 				log.setFunctionId(Integer.parseInt(request.getParameter("functionId")));
 			}
+			if(!StringUtil.isEmpty(request.getParameter("compileId"))){
+				log.setCompileIds(request.getParameter("compileId"));
+			}else{
+				log.setCompileIds(request.getParameter("compileIds"));
+			}
 			
+			if(!StringUtil.isEmpty(request.getParameter("cfgId"))){
+				log.setCfgIds(request.getParameter("cfgId"));
+			}else{
+				log.setCfgIds(request.getParameter("ids"));
+			}
+			if(!StringUtil.isEmpty(request.getParameter("isAudit"))){
+				log.setAuditState(Integer.parseInt(request.getParameter("isAudit")));
+			}
+			if(!StringUtil.isEmpty(request.getParameter("action"))){
+				log.setAction(Integer.parseInt(request.getParameter("action")));
+			}
+			if(!(StringUtil.isEmpty(request.getParameter("isValid")))){
+				log.setIsValid(Integer.parseInt(request.getParameter("isValid")));
+			}
 			// 异步保存日志
 			new SaveLogThread(log, handler, ex).start();
 		}
@@ -96,6 +115,7 @@ public class LogUtils {
 				String permission = "";
 				if (handler instanceof HandlerMethod){
 					Method m = ((HandlerMethod)handler).getMethod();
+					log.setMethodName(m.getName());
 					RequiresPermissions rp = m.getAnnotation(RequiresPermissions.class);
 					permission = (rp != null ? StringUtils.join(rp.value(), ",") : "");
 				}
@@ -104,11 +124,44 @@ public class LogUtils {
 			}
 			// 如果有异常，设置异常信息
 			log.setException(Exceptions.getStackTraceAsString(ex));
-			// 如果无标题并无异常日志，则不保存信息
-			if (StringUtils.isBlank(log.getTitle()) && StringUtils.isBlank(log.getException())){
+			// 如果无标题并无异常日志并且无具体的功能id(非业务配置的操作），则不保存信息
+			if ((StringUtils.isBlank(log.getTitle()) && StringUtils.isBlank(log.getException()) && (log.getFunctionId()==null ||  log.getFunctionId()==0))){
 				return;
 			}
 			// 保存日志信息
+			if(log.getFunctionId()!=null 
+					&& log.getFunctionId()!=0 ){
+				String functionName = DictUtils.getDictLabel("SYS_SERVICE_FUNCTION", log.getFunctionId().toString());
+				if(!StringUtil.isEmpty(log.getMethodName())){
+					String operation = DictUtils.getDictLabel("SYS_SERVICE_OPERATION", log.getMethodName());
+					if("saveOrUpdate".equals(operation)){
+						if (log.getCfgId()!=null || log.getCfgIds()!=null || log.getCompileId()!=null || log.getCompileIds()!=null){
+							log.setOperation("edit");
+						}else{
+							log.setOperation("add");
+						}
+					}else{
+						log.setOperation(operation);
+					}
+				}
+				if(log.getOperation()!=null && !"默认".equals(log.getOperation()) && !"默认".equals(functionName)){
+					log.setFunctionName(functionName);
+					if(!StringUtil.isEmpty(log.getCompileIds())){
+						for(String compileId:StringUtils.split(log.getCompileIds(),",")){
+							log.setCompileId(Integer.parseInt(compileId));
+							logDao.insertCfgOperationLog(log);
+						}
+					}else if(!StringUtil.isEmpty(log.getCfgIds())){
+						for(String cfgId:StringUtils.split(log.getCfgIds(),",")){
+							log.setCfgId(Integer.parseInt(cfgId));
+							logDao.insertCfgOperationLog(log);
+						}
+					}else{
+						logDao.insertCfgOperationLog(log);
+					}
+				}
+			}
+			
 			logDao.insert(log);
 		}
 	}
@@ -202,7 +255,6 @@ public class LogUtils {
 					}
 				}
 			}
-			
 			CacheUtils.put(CACHE_MENU_NAME_PATH_MAP, menuMap);
 			CacheUtils.put(CACHE_MENU_NAME_PATH_MAP2, menuMap2);
 		}
@@ -240,7 +292,6 @@ public class LogUtils {
 				return "";
 			}
 		}
-		System.out.println(menuNamePath);
 		return menuNamePath;
 	}
 

src/main/java/com/nis/util/excel/ExportExcel.java

@@ -1821,7 +1821,23 @@ public class ExportExcel {
 				if(!StringUtil.isEmpty(titleStr)){
 					//去掉不需要展示的header
 					if(!(noExportField.indexOf(","+titleStr+",") > -1)){
-						titleStr=msgProp.getProperty(titleStr)==null?titleStr:msgProp.getProperty(titleStr);
+						//需要替换的header
+						boolean flag=true;
+						if(noExportField.contains("&")){
+							String replaceField=noExportField.substring(noExportField.indexOf("&")+1);
+							String[] replaceStr=replaceField.split("-");
+							for (int i = 0; i < replaceStr.length; i++) {
+								String [] fields=replaceStr[i].split(":");
+								if(fields[0].equals(titleStr)){
+									titleStr=msgProp.getProperty(fields[1]);
+									flag=false;
+									break;
+							 }
+						   }
+						}
+						if(flag){
+						   titleStr=msgProp.getProperty(titleStr)==null?titleStr:msgProp.getProperty(titleStr);
+						}
 						headerList.add(titleStr);
 						commentList.add(commentStr);
 					}