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-28 17:14:00 +08:00
parent b8486f0721 7de4960458
commit b80a949e3b
3 changed files with 56 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,10 +22,12 @@ import com.nis.domain.Page;
import com.nis.domain.PageLog; import com.nis.domain.PageLog;
import com.nis.domain.log.DkBehaviorLog; import com.nis.domain.log.DkBehaviorLog;
import com.nis.domain.maat.LogRecvData; import com.nis.domain.maat.LogRecvData;
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.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;
@Controller @Controller
@RequestMapping(value = "${adminPath}/log/manipulation/dkbehaviorLogs") @RequestMapping(value = "${adminPath}/log/manipulation/dkbehaviorLogs")
@@ -42,19 +44,45 @@ public class DkBehaviorLogController extends BaseController{
*/ */
@RequestMapping(value={"list",""}) @RequestMapping(value={"list",""})
public String list(Model model,@ModelAttribute("log")DkBehaviorLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException { public String list(Model model,@ModelAttribute("log")DkBehaviorLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
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());
model.addAttribute("serviceList", serviceList);
if(entry.getAction()!=null){
for(FunctionServiceDict service:serviceList){
if(service.getAction().intValue()==entry.getAction().intValue()){
searchService=service.getServiceId().toString();
}
}
}else{
for(int i=0;i<serviceList.size();i++){
if(serviceList.get(i).getServiceId()!=32 && serviceList.get(i).getServiceId()!=128){
searchService = serviceList.get(i).getServiceId().toString();
entry.setAction(serviceList.get(i).getAction());
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());
//查询值判断 //查询值判断
initLogSearchValue(entry,params); initLogSearchValue(entry,params);
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId()); //获取字典信息
model.addAttribute("serviceList", serviceList); List<CodeResult> protocolList=CodeDicUtils.getCodeList("protocolCode");
List<CodeResult> osList=CodeDicUtils.getCodeList("osCode");
List<CodeResult> browserList=CodeDicUtils.getCodeList("browserCode");
List<CodeResult> behaviorList=CodeDicUtils.getCodeList("behaviorCode");
List<CodeResult> appList=CodeDicUtils.getCodeList("appCode");
model.addAttribute("protocolList", protocolList);
model.addAttribute("osList", osList);
model.addAttribute("browserList", browserList);
model.addAttribute("behaviorList", behaviorList);
model.addAttribute("appList", appList);
String url = ""; String url = "";
url = Constants.LOG_BASE_URL+Constants.NTC_DKBEHAVIOR_LOG; url = Constants.LOG_BASE_URL+Constants.NTC_DKBEHAVIOR_LOG;
String jsonString = HttpClientUtil.getMsg(url,params,request); String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -81,4 +109,5 @@ public class DkBehaviorLogController extends BaseController{
return "/log/manipulation/dkBehaviorList"; return "/log/manipulation/dkBehaviorList";
} }
} }

37
src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
View File

@@ -5,8 +5,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
//筛选功能
filterActionInit();
//reset //reset
$("#resetBtn").on("click",function(){ $("#resetBtn").on("click",function(){
$("select.selectpicker").each(function(){ $("select.selectpicker").each(function(){
@@ -20,7 +19,8 @@ $(document).ready(function(){
.attr("value",''); .attr("value",'');
$("#searchForm")[0].reset(); $("#searchForm")[0].reset();
}); });
//筛选功能
filterActionInit();
}); });
</script> </script>
@@ -58,24 +58,19 @@ $(document).ready(function(){
<!-- 搜索内容与操作按钮栏 --> <!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12"> <div class="col-md-12">
<div class="pull-left"> <div class="pull-left">
<select path="action" class="selectpicker select2 input-small"> <form:select path="action" class="selectpicker select2 input-small">
<option value=""><spring:message code="action"/></option> <%-- <form:option value=""><spring:message code="action"/></form:option>
<c:forEach items="${serviceList}" var="service" --%> <c:forEach items="${serviceList}" var="service"
varStatus="satus"> varStatus="satus">
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict"> <c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)}"> --%> <c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)}">
<option value="${dict.itemCode}" <form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
<c:if test="${log.action eq dict.itemCode}">
selected
</c:if>
>
<spring:message code="${dict.itemValue}"/>
</option>
</c:if> </c:if>
</c:forEach> </c:forEach>
</c:forEach> </c:forEach>
</select> </form:select>
</div> </div>
<div class="pull-left"> <div class="pull-left">
<div class="input-group"> <div class="input-group">
<div class="input-group-btn"> <div class="input-group-btn">
@@ -232,35 +227,35 @@ $(document).ready(function(){
</td> </td>
<td> <td>
<c:forEach items="${fns:getCodeList('protocolCode')}" var="dict"> <c:forEach items="${protocolList}" var="dict">
<c:if test="${dict.code eq log.labelProtoId}"> <c:if test="${dict.code eq log.labelProtoId}">
<spring:message code="${dict.item}"/> <spring:message code="${dict.item}"/>
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td>
<td> <td>
<c:forEach items="${fns:getCodeList('osCode')}" var="dict"> <c:forEach items="${osList}" var="dict">
<c:if test="${dict.code eq log.labelOsId}"> <c:if test="${dict.code eq log.labelOsId}">
<spring:message code="${dict.item}"/> <spring:message code="${dict.item}"/>
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td>
<td> <td>
<c:forEach items="${fns:getCodeList('browserCode')}" var="dict"> <c:forEach items="${browserList}" var="dict">
<c:if test="${dict.code eq log.labelBsId}"> <c:if test="${dict.code eq log.labelBsId}">
<spring:message code="${dict.item}"/> <spring:message code="${dict.item}"/>
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td>
<td> <td>
<c:forEach items="${fns:getCodeList('behaviorCode')}" var="dict"> <c:forEach items="${behaviorList}" var="dict">
<c:if test="${dict.code eq log.labelBehavId}"> <c:if test="${dict.code eq log.labelBehavId}">
<spring:message code="${dict.item}"/> <spring:message code="${dict.item}"/>
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td>
<td> <td>
<c:forEach items="${fns:getCodeList('appCode')}" var="dict"> <c:forEach items="${appList}" var="dict">
<c:if test="${dict.code eq log.labelAppId}"> <c:if test="${dict.code eq log.labelAppId}">
<spring:message code="${dict.item}"/> <spring:message code="${dict.item}"/>
</c:if> </c:if>

18
src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
View File

@@ -46,24 +46,18 @@
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/> <input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
<!-- 搜索内容与操作按钮栏 --> <!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12"> <div class="col-md-12">
<div class="pull-left"> <div class="pull-left">
<select path="action" class="selectpicker select2 input-small"> <form:select path="action" class="selectpicker select2 input-small">
<option value=""><spring:message code="action"/></option> <form:option value=""><spring:message code="action"/></form:option>
<c:forEach items="${serviceList}" var="service" <c:forEach items="${serviceList}" var="service"
varStatus="satus"> varStatus="satus">
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict"> <c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)}"> --%> <c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)}">
<option value="${dict.itemCode}" <form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
<c:if test="${log.action eq dict.itemCode}">
selected
</c:if>
>
<spring:message code="${dict.itemValue}"/>
</option>
</c:if> </c:if>
</c:forEach> </c:forEach>
</c:forEach> </c:forEach>
</select> </form:select>
</div> </div>
<div class="pull-left"> <div class="pull-left">
<div class="input-group"> <div class="input-group">