gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Release-1.3' of http://192.168.10.125/galaxy/galaxy-service.git into Release-1.3

Browse Source
This commit is contained in:
zhanghongqing
2018-10-26 14:41:49 +08:00
parent 2f73a5799b 0a5fa73f81
commit c9362988f0
14 changed files with 183 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java
View File

@@ -1445,7 +1445,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService {
}
private void addTmpReion(List<Map<String, String>> regionMapList, MaatXmlConfig maatXmlConfig,
Transaction transaction, int type, int tmpStorageReuseRegionDB, int idRelaRedisDBIndex, Integer service) {
Transaction transaction, int type, int tmpStorageReuseRegionDB, int idRelaRedisDBIndex, Integer service1) {
if (regionMapList != null && regionMapList.size() > 0) {
for (Map<String, String> map : regionMapList) {
List<MaatXmlExpr> expressionList = maatXmlConfig.getExpressionList();
@@ -1488,8 +1488,9 @@ public class ConfigJedisServiceimpl implements ConfigRedisService {
for (String valStr : valSplit) {
if (!StringUtils.isEmpty(valStr) && valStr.trim().startsWith("[")) {
valStr = valStr.trim().replace("[", "").replace("]", "");
if (service != null && service.intValue() == 1028
&& valStr.toLowerCase().equals("op_time") && type == 12) {
// if (service != null && service.intValue() == 1028
// && valStr.toLowerCase().equals("op_time") && type == 12) {
if (valStr.toLowerCase().equals("op_time") && type == 12) {
String user_region = map.get("user_region");
valBF.append(user_region + "\t");
}

2
src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
View File

@@ -864,7 +864,7 @@ public class ConfigSourcesService extends BaseService {
} else {
maatConfig.getIpRegionMapList().addAll(dstMapList);
}
maatConfig.setService(groupReuse.getService());
//maatConfig.setService(groupReuse.getService());
list.add(maatConfig);
}

7
src/main/java/com/nis/web/service/restful/TrafficNmsServerStatisticService.java
View File

@@ -18,8 +18,11 @@ public class TrafficNmsServerStatisticService {
public void saveNmsInfo(List<TrafficNmsServerStatistic> trafficNmsServerList) {
for (TrafficNmsServerStatistic trafficNmsServerStatistic : trafficNmsServerList) {
trafficNmsServerStatisticDao.insert(trafficNmsServerStatistic);
trafficNmsServerStatisticDao.insertAbnormalMachine(trafficNmsServerStatistic.getId(),
trafficNmsServerStatistic.getAbnormalMachineList());
if (trafficNmsServerStatistic.getAbnormalMachineList() != null
&& trafficNmsServerStatistic.getAbnormalMachineList().size() > 0) {
trafficNmsServerStatisticDao.insertAbnormalMachine(trafficNmsServerStatistic.getId(),
trafficNmsServerStatistic.getAbnormalMachineList());
}
}
}
}