Skip to content

N
Nse
Commit 7a0bb72b by 周海峰
Options

no message

parent 62e46254
正在显示 包含 44 行增加 和 37 行删除
src/main/java/com/chenyang/nse/bussiness/service/core/impl/strategy/MaksingAppDataRuleServiceImpl.java
...@@ -481,18 +481,27 @@ public class MaksingAppDataRuleServiceImpl implements MaksingAppDataRuleService ...@@ -481,18 +481,27 @@ public class MaksingAppDataRuleServiceImpl implements MaksingAppDataRuleService
HashMap m = new HashMap(); HashMap m = new HashMap();
List<TCoreEncryptionTypeField> tCoreEncryptionTypeFieldList; List<TCoreEncryptionTypeField> tCoreEncryptionTypeFieldList;
List<TCoreEncryptionTypeField> tCoreEncryptionTypeFieldList1; List<TCoreEncryptionTypeField> tCoreEncryptionTypeFieldList1;
List<Criterion> criteria = new ArrayList<>();
criteria.add(Restrictions.eq("projectid", vo.getProjectid()));
if (StringUtils.isNotBlank(vo.getSchema())) {
criteria.add(Restrictions.ilike("tschemas", vo.getSchema(), MatchMode.ANYWHERE));
}
if (StringUtils.isNotBlank(vo.getDatasystemname())) {
criteria.add(Restrictions.ilike("datasystemname", vo.getDatasystemname(), MatchMode.ANYWHERE));
}
if (StringUtils.isNotBlank(vo.getTable_name())) {
criteria.add(Restrictions.ilike("names", vo.getTable_name(), MatchMode.ANYWHERE));
}
if (StringUtils.isNotBlank(vo.getColumnname())) {
criteria.add(Restrictions.ilike("table_field_id", vo.getColumnname(), MatchMode.ANYWHERE));
}
if (vo.getFlag() != null && vo.getFlag().length != 0) { if (vo.getFlag() != null && vo.getFlag().length != 0) {
tCoreEncryptionTypeFieldList1 = this.tCoreEncryptionTypeFieldDao.queryAll(new Criterion[]{Restrictions.eq("projectid", vo.getProjectid()), Restrictions.ilike("tschemas", vo.getSchema(), MatchMode.ANYWHERE), Restrictions.ilike("datasystemname", vo.getDatasystemname(), MatchMode.ANYWHERE), Restrictions.ilike("names", vo.getTable_name(), MatchMode.ANYWHERE), Restrictions.ilike("table_field_id", vo.getColumnname(), MatchMode.ANYWHERE), Restrictions.ilike("tschemas", vo.getSchema(), MatchMode.ANYWHERE), Restrictions.in("flag", Arrays.asList(vo.getFlag())), Restrictions.eq("state", "0")}); criteria.add(Restrictions.in("flag", Arrays.asList(vo.getFlag())));
PageInfo pageInfo = new PageInfo(); }
pageInfo.setPageno(vo.getPage()); criteria.add(Restrictions.eq("state", "0"));
pageInfo.setPagesize(vo.getRows());
ArrayList<Order> orderList = new ArrayList(); tCoreEncryptionTypeFieldList1 = this.tCoreEncryptionTypeFieldDao.queryAll(criteria.toArray(new Criterion[0]));
orderList.add(Order.asc("tschemas"));
orderList.add(Order.asc("names"));
orderList.add(Order.asc("table_field_id"));
tCoreEncryptionTypeFieldList = this.tCoreEncryptionTypeFieldDao.queryByPageInfoByOrders(pageInfo, orderList, new Criterion[]{Restrictions.eq("projectid", vo.getProjectid()), Restrictions.ilike("tschemas", vo.getSchema(), MatchMode.ANYWHERE), Restrictions.ilike("datasystemname", vo.getDatasystemname(), MatchMode.ANYWHERE), Restrictions.ilike("names", vo.getTable_name(), MatchMode.ANYWHERE), Restrictions.ilike("table_field_id", vo.getColumnname(), MatchMode.ANYWHERE), Restrictions.ilike("tschemas", vo.getSchema(), MatchMode.ANYWHERE), Restrictions.in("flag", Arrays.asList(vo.getFlag())), Restrictions.eq("state", "0")});
} else {
tCoreEncryptionTypeFieldList1 = this.tCoreEncryptionTypeFieldDao.queryAll(new Criterion[]{Restrictions.eq("projectid", vo.getProjectid()), Restrictions.ilike("tschemas", vo.getSchema(), MatchMode.ANYWHERE), Restrictions.ilike("datasystemname", vo.getDatasystemname(), MatchMode.ANYWHERE), Restrictions.ilike("names", vo.getTable_name(), MatchMode.ANYWHERE), Restrictions.ilike("table_field_id", vo.getColumnname(), MatchMode.ANYWHERE), Restrictions.ilike("tschemas", vo.getSchema(), MatchMode.ANYWHERE), Restrictions.eq("state", "0")});
PageInfo pageInfo = new PageInfo(); PageInfo pageInfo = new PageInfo();
pageInfo.setPageno(vo.getPage()); pageInfo.setPageno(vo.getPage());
pageInfo.setPagesize(vo.getRows()); pageInfo.setPagesize(vo.getRows());
...@@ -500,23 +509,22 @@ public class MaksingAppDataRuleServiceImpl implements MaksingAppDataRuleService ...@@ -500,23 +509,22 @@ public class MaksingAppDataRuleServiceImpl implements MaksingAppDataRuleService
orderList.add(Order.asc("tschemas")); orderList.add(Order.asc("tschemas"));
orderList.add(Order.asc("names")); orderList.add(Order.asc("names"));
orderList.add(Order.asc("table_field_id")); orderList.add(Order.asc("table_field_id"));
tCoreEncryptionTypeFieldList = this.tCoreEncryptionTypeFieldDao.queryByPageInfoByOrders(pageInfo, orderList, new Criterion[]{Restrictions.eq("projectid", vo.getProjectid()), Restrictions.ilike("tschemas", vo.getSchema(), MatchMode.ANYWHERE), Restrictions.ilike("datasystemname", vo.getDatasystemname(), MatchMode.ANYWHERE), Restrictions.ilike("names", vo.getTable_name(), MatchMode.ANYWHERE), Restrictions.ilike("table_field_id", vo.getColumnname(), MatchMode.ANYWHERE), Restrictions.ilike("tschemas", vo.getSchema(), MatchMode.ANYWHERE), Restrictions.eq("state", "0")}); tCoreEncryptionTypeFieldList = this.tCoreEncryptionTypeFieldDao.queryByPageInfoByOrders(pageInfo, orderList, criteria.toArray(new Criterion[0]));
}
int total = tCoreEncryptionTypeFieldList1.size(); int total = tCoreEncryptionTypeFieldList1.size();
tCoreEncryptionTypeFieldList = this.columnExist(tCoreEncryptionTypeFieldList); tCoreEncryptionTypeFieldList = this.columnExist(tCoreEncryptionTypeFieldList);
for(TCoreEncryptionTypeField field : tCoreEncryptionTypeFieldList) { for (TCoreEncryptionTypeField field : tCoreEncryptionTypeFieldList) {
TCoreSecretkey tCoreSecretkey = (TCoreSecretkey)this.tCoreSecretkeyDao.get(field.getEncryption_secretkey_id()); TCoreSecretkey tCoreSecretkey = (TCoreSecretkey) this.tCoreSecretkeyDao.get(field.getEncryption_secretkey_id());
if (tCoreSecretkey != null) { if (tCoreSecretkey != null) {
field.setSecretkeyname(tCoreSecretkey.getSecret_key_name()); field.setSecretkeyname(tCoreSecretkey.getSecret_key_name());
TCoreEncryption tCoreEncryption = (TCoreEncryption)this.tCoreEncryptionDao.get(tCoreSecretkey.getEncryption_id()); TCoreEncryption tCoreEncryption = (TCoreEncryption) this.tCoreEncryptionDao.get(tCoreSecretkey.getEncryption_id());
if (tCoreEncryption != null) { if (tCoreEncryption != null) {
field.setEncryptiontypename(tCoreEncryption.getEncryption_name()); field.setEncryptiontypename(tCoreEncryption.getEncryption_name());
} }
} }
TCoreDatasystem tCoreDatasystem = (TCoreDatasystem)this.tCoreDatasystemDao.get(field.getDatasystem_id()); TCoreDatasystem tCoreDatasystem = (TCoreDatasystem) this.tCoreDatasystemDao.get(field.getDatasystem_id());
if (tCoreDatasystem != null) { if (tCoreDatasystem != null) {
field.setDatasystemname(tCoreDatasystem.getSysname()); field.setDatasystemname(tCoreDatasystem.getSysname());
} }
......
src/main/resources/config.properties
[\u6570\u636E\u6301\u4E45\u5316\u914D\u7F6E] [数据持久化配置]
#IP信息 #IP信息
#jdbc.host=192.168.2.127 #jdbc.host=192.168.2.127
#正式环境 #正式环境
...@@ -44,11 +44,11 @@ jdbc.dialect=org.hibernate.dialect.MySQL5Dialect ...@@ -44,11 +44,11 @@ jdbc.dialect=org.hibernate.dialect.MySQL5Dialect
#jdbc.dialect=org.hibernate.dialect.DmDialect #jdbc.dialect=org.hibernate.dialect.DmDialect
#jdbc.dialect=org.hibernate.dialect.H2Dialect #jdbc.dialect=org.hibernate.dialect.H2Dialect
[\u5168\u5C40\u53C2\u6570] [全局参数]
#license\u5B58\u653E\u8DEF\u5F84 #license文件路径
licensedir=${basePath}/data/infa_file/lic #licensedir=${basePath}/data/infa_file/lic
#licensedir=D:/lic licensedir=D:/lic
#\u662F\u5426\u9700\u8981licenseKey 0:\u4E0D\u9700\u8981\u9A8C\u8BC1 1\uFF1A\u9700\u8981\u9A8C\u8BC1 #是否启用license licenseKey 0:否 1 是
isNeedLicenseKey=0 isNeedLicenseKey=0
#错误登录允许次数 #错误登录允许次数
login_limit_num=5 login_limit_num=5
...@@ -56,16 +56,15 @@ login_limit_num=5 ...@@ -56,16 +56,15 @@ login_limit_num=5
deployPath=${basePath}/data deployPath=${basePath}/data
#系统版本号 #系统版本号
sys_version=v2.9 sys_version=v2.9
[\u65E5\u5FD7\u5C5E\u6027] [日志属性]
#\u8BBE\u7F6E\u65E5\u5FD7\u6587\u4EF6\u8DEF\u5F84 #设置日志文件路径
logpath = ./loginfo logpath = ${basePath}/data/loginfo
#logpath = ${basePath}/data/loginfo #获取发现过程日志路径
#\u83B7\u53D6\u53D1\u73B0\u8FC7\u7A0B\u65E5\u5FD7\u8DEF\u5F84
tasklogger = ${maskingPath}/app/tasklogger/ tasklogger = ${maskingPath}/app/tasklogger/
#\u53D1\u73B0\u7ED3\u679C\u5BFC\u51FA\u8DEF\u5F84 #发现结果导出路径
discoveryResultDir=${basePath}/data/infa_project/export/ discoveryResultDir=${basePath}/data/infa_project/export/
#\u53D1\u73B0\u4EFB\u52A1\u7248\u672C\u8DEF\u5F84 ##发现任务版本路径
#TaskVersion=D:\\version\\TaskVersion\\ #TaskVersion=D:\\version\\TaskVersion\\
#ProjectVersion=D:\\version\\ProjectVersion\\ #ProjectVersion=D:\\version\\ProjectVersion\\
#AllVersion=D:\\version\\AllVersion\\ #AllVersion=D:\\version\\AllVersion\\
...@@ -73,21 +72,21 @@ TaskVersion=${basePath}/data/infa_project/TaskVersion/ ...@@ -73,21 +72,21 @@ TaskVersion=${basePath}/data/infa_project/TaskVersion/
ProjectVersion=${basePath}/data/infa_project/ProjectVersion/ ProjectVersion=${basePath}/data/infa_project/ProjectVersion/
AllVersion=${basePath}/data/infa_project/AllVersion/ AllVersion=${basePath}/data/infa_project/AllVersion/
CustomVersion=${basePath}/data/infa_project/CustomVersion/ CustomVersion=${basePath}/data/infa_project/CustomVersion/
#\u7528\u4E8E\u56DE\u64A4\u7684\u5907\u4EFDsql\u8DEF\u5F84 #用于回撤的备份sql路径
ResetResult=${basePath}/data/infa_project/ResetResult/ ResetResult=${basePath}/data/infa_project/ResetResult/
#\u53D1\u73B0\u4EFB\u52A1\u76D1\u63A7\u8DEF\u5F84 #发现任务监控路径
#monitorFile=D:\\work\\ghca 2.0\\file\\ #monitorFile=D:\\work\\ghca 2.0\\file\\
monitorFile=${basePath}/data/infa_project/monitorFile/ monitorFile=${basePath}/data/infa_project/monitorFile/
#\u53D1\u73B0\u4EFB\u52A1\uFF0C\u7ED3\u679C\u9875\u662F\u5426\u9700\u8981\u663E\u793A\u5339\u914D\u7387(0-\u4E0D\u663E\u793A\uFF1B1-\u663E\u793A) #发现任务，结果页是否需要显示匹配率(0-不显示；1-显示)
isRate=1 isRate=1
#\u53D1\u73B0\u4EFB\u52A1\uFF0C\u7ED3\u679C\u9875\u5339\u914D\u7387\u663E\u793A\u6761\u6570 #发现任务，结果页匹配率显示条数
rateNum=10 rateNum=10
#\u53D1\u73B0\u4EFB\u52A1\uFF0C\u6267\u884C\u5339\u914D\u548C\u4E0D\u5339\u914D\u6587\u4EF6\u5B58\u653E\u5730\u5740 #发现任务，执行匹配和不匹配文件存放地址
#rateDir=D:\\work\\ghca 2.0\\rate\\ #rateDir=D:\\work\\ghca 2.0\\rate\\
rateDir=${basePath}/data/infa_project/rate/ rateDir=${basePath}/data/infa_project/rate/
#\u53D1\u73B0\u4EFB\u52A1\uFF0C\u76F8\u5173\u6027\u7B97\u6CD5\u7F6E\u4FE1\u5EA6\u663E\u793A\u5927\u4E8E60% #发现任务，相关性算法置信度显示大于60%
confidenceRate=0.6 confidenceRate=0.6
#\u53D1\u73B0\u4EFB\u52A1\uFF0C\u65E0\u7ED3\u6784\u6587\u4EF6\u56FE\u7247\u53D1\u73B0\uFF0C\u4E0B\u8F7D\u672C\u5730\u8DEF\u5F84\uFF08FTP/SFTP\uFF09 #发现任务，无结构文件图片发现，下载本地路径（FTP/SFTP）
pictureDir=${basePath}/data/infa_project/pic/ pictureDir=${basePath}/data/infa_project/pic/
#发现任务 一次查询的条数 #发现任务 一次查询的条数
readCntByOneTime=10000 readCntByOneTime=10000
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论