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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
duandongmei
2018-08-29 15:33:33 +08:00
parent 94565252ef b5a96d1184
commit 7be592b74e
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java
View File

@@ -25,6 +25,7 @@ import com.nis.domain.maat.LogRecvData;
import com.nis.util.CodeDicUtils; import com.nis.util.CodeDicUtils;
import com.nis.util.Constants; import com.nis.util.Constants;
import com.nis.util.DictUtils; import com.nis.util.DictUtils;
import com.nis.util.StringUtil;
import com.nis.util.httpclient.HttpClientUtil; import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController; import com.nis.web.controller.BaseController;
import com.nis.web.dao.dashboard.codedic.CodeResult; import com.nis.web.dao.dashboard.codedic.CodeResult;
@@ -47,26 +48,17 @@ public class DkBehaviorLogController extends BaseController{
try { try {
PageLog<DkBehaviorLog> page = new PageLog<DkBehaviorLog>(request, response); PageLog<DkBehaviorLog> page = new PageLog<DkBehaviorLog>(request, response);
Map<String, Object> params=new HashMap<>(); Map<String, Object> params=new HashMap<>();
String searchService=null;
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId()); List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
model.addAttribute("serviceList", serviceList); model.addAttribute("serviceList", serviceList);
if(entry.getAction()!=null){ if(StringUtil.isEmpty(entry.getAction())){
for(FunctionServiceDict service:serviceList){
if(service.getAction().intValue()==entry.getAction().intValue()){
searchService=service.getServiceId().toString();
}
}
}else{
for(int i=0;i<serviceList.size();i++){ for(int i=0;i<serviceList.size();i++){
if(serviceList.get(i).getServiceId()!=32 && serviceList.get(i).getServiceId()!=128){ if(serviceList.get(i).getServiceId()!=32 && serviceList.get(i).getServiceId()!=128){
searchService = serviceList.get(i).getServiceId().toString();
entry.setAction(serviceList.get(i).getAction()); entry.setAction(serviceList.get(i).getAction());
break; break;
} }
} }
} }
params.put("searchService", searchService);
params.put("pageSize", page.getPageSize()); params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo()); params.put("pageNo", page.getPageNo());
//查询值判断 //查询值判断