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配置功能完成
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user