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

通联日志国际化调整、检索条件添加及域名字典对应调整

Browse Source
This commit is contained in:
leijun
2019-01-07 19:40:46 +08:00
parent b85dd1a8cc
commit 4bd99aca72
4 changed files with 56 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java
View File

@@ -22,6 +22,7 @@ import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.PageLog;
import com.nis.domain.SysUser;
import com.nis.domain.configuration.WebsiteDomainTopic;
import com.nis.domain.log.NtcConnRecordLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.exceptions.MaatConvertException;
@@ -71,11 +72,19 @@ public class NtcConnRecordLogController extends BaseController {
params.put("searchClientLocate", log.getClientLocate());
}
if (StringUtils.isNotBlank(log.getsSubscribeId())) {
params.put("searchSSubscribeId", log.getsSubscribeId());
}
if (StringUtils.isNotBlank(log.getdSubscribeId())) {
params.put("searchDSubscribeId", log.getdSubscribeId());
}
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
model.addAttribute("serviceList", serviceList);
List<CodeResult> appList = CodeDicUtils.getCodeList("appCode");
List<CodeResult> protocolList = CodeDicUtils.getCodeList("protocolCode");
List<CodeResult> webList = CodeDicUtils.getCodeList("webCode");
//查询domainId
List<WebsiteDomainTopic> webList = appCfgService.getDomainDict(new WebsiteDomainTopic());
model.addAttribute("appList", appList);
model.addAttribute("protocolList", protocolList);
@@ -184,11 +193,21 @@ public class NtcConnRecordLogController extends BaseController {
if (StringUtils.isNotBlank(log.getClientLocate())) {
params.put("searchClientLocate", log.getClientLocate());
}
if (StringUtils.isNotBlank(log.getsSubscribeId())) {
params.put("searchSSubscribeId", log.getsSubscribeId());
}
if (StringUtils.isNotBlank(log.getdSubscribeId())) {
params.put("searchDSubscribeId", log.getdSubscribeId());
}
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
model.addAttribute("serviceList", serviceList);
List<CodeResult> appList = CodeDicUtils.getCodeList("appCode");
List<CodeResult> protocolList = CodeDicUtils.getCodeList("protocolCode");
List<CodeResult> webList = CodeDicUtils.getCodeList("webCode");
//List<CodeResult> webList = CodeDicUtils.getCodeList("webCode");
//查询domainId
List<WebsiteDomainTopic> webList = appCfgService.getDomainDict(new WebsiteDomainTopic());
model.addAttribute("appList", appList);
model.addAttribute("protocolList", protocolList);
model.addAttribute("webList", webList);
@@ -214,7 +233,7 @@ public class NtcConnRecordLogController extends BaseController {
l.setProtoId(getName(l.getProtoId(),protocolList,msgProp));
}
if (StringUtils.isNotBlank(l.getWebId())) {
l.setWebId(getName(l.getWebId(),webList,msgProp));
l.setWebId(getWebName(l.getWebId(),webList,msgProp));
}
if (StringUtils.isNotBlank(l.getC2sPktNum()) && StringUtils.isNotBlank(l.getS2cPktNum()) ) {
l.setTotalPkt(String.valueOf(Integer.valueOf(l.getC2sPktNum())+Integer.valueOf(l.getS2cPktNum())));
@@ -260,5 +279,16 @@ public class NtcConnRecordLogController extends BaseController {
}
return name;
}
public String getWebName(String id,List<WebsiteDomainTopic> list,Properties msgProp){
String name=String.valueOf(id);
for (int i = 0; i < list.size(); i++) {
if(String.valueOf(id).equals(list.get(i).getId())){
name=msgProp.getProperty(list.get(i).getDomain(),list.get(i).getDomain());
break;
}
}
return name;
}
}