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://192.168.10.125/k18_web/NFS.git into develop

Browse Source
This commit is contained in:
zhangwq
2018-12-04 16:43:21 +08:00
parent f3336efea1 6ae81cf820
commit fe65a7ddf5
8 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
View File

@@ -36,7 +36,7 @@ public class NtcDestIpReportController extends BaseController {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
if(bean.getServiceId()!=null){
bean.setServices(bean.getServiceId().toString());
bean.setSearchService(bean.getServiceId().toString());
}else{
StringBuffer serviceId=new StringBuffer();
for(int i=0;i<serviceList.size();i++){

2
src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
View File

@@ -35,7 +35,7 @@ public class NtcEntranceReportController extends BaseController {
public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
if(bean.getServiceId()!=null){
bean.setServices(bean.getServiceId().toString());
bean.setSearchService(bean.getServiceId().toString());
}else{
StringBuffer serviceId=new StringBuffer();
for(int i=0;i<serviceList.size();i++){

4
src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
View File

@@ -34,10 +34,10 @@ public class NtcLwhhReportController extends BaseController {
@RequestMapping("/ajaxNtcLwhhReport")
public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
List<RequestInfo> requestInfos=requestInfoService.getAllLwhhRequestInfo();
List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
model.addAttribute("requestInfos", requestInfos);
if(bean.getServiceId()!=null){
bean.setServices(bean.getServiceId().toString());
bean.setSearchService(bean.getServiceId().toString());
}else{
StringBuffer serviceId=new StringBuffer();
for(int i=0;i<serviceList.size();i++){

2
src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java
View File

@@ -35,7 +35,7 @@ public class NtcSrcipDomesticReportController extends BaseController {
public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
if(bean.getServiceId()!=null){
bean.setServices(bean.getServiceId().toString());
bean.setSearchService(bean.getServiceId().toString());
}else{
StringBuffer serviceId=new StringBuffer();
for(int i=0;i<serviceList.size();i++){

2
src/main/java/com/nis/web/controller/report/NtcTagReportController.java
View File

@@ -37,7 +37,7 @@ public class NtcTagReportController extends BaseController {
List<ServiceDictInfo> labels=serviceDictInfoService.findAllLableDict();
model.addAttribute("labels", labels);
if(bean.getServiceId()!=null){
bean.setServices(bean.getServiceId().toString());
bean.setSearchService(bean.getServiceId().toString());
}else{
StringBuffer serviceId=new StringBuffer();
for(int i=0;i<serviceList.size();i++){

2
src/main/java/com/nis/web/controller/report/NtcXzReportController.java
View File

@@ -38,7 +38,7 @@ public class NtcXzReportController extends BaseController {
List<ServiceDictInfo> xzs=serviceDictInfoService.findAllXzDict();
model.addAttribute("xzs", xzs);
if(bean.getServiceId()!=null){
bean.setServices(bean.getServiceId().toString());
bean.setSearchService(bean.getServiceId().toString());
}else{
StringBuffer serviceId=new StringBuffer();
for(int i=0;i<serviceList.size();i++){

1
src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql
View File

@@ -3,6 +3,5 @@ INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `
#日志查询-出入口字典添加
INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES ('81', '出入口', 'ENTRANCE', '出入口id和对应的名称', 'user:管理员,2018-12-03 18:45:59edit|用户管理员,在2018-08-07 09:53:56修改！|用户管理员,在2018-06-15 11:53:01修改！|用户管理员,在2018-06-15 11:52:16修改！|用户管理员,在2018-06-15 11:35:15修改！', '2018-06-15 11:34:02', '2018-12-03 18:45:59', '1');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3168', '1', 'astana', 'astana', '0', '1', '1', '81');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3169', '2', 'almaty', 'almaty', '0', '1', '1', '81');

6
src/main/webapp/WEB-INF/views/report/list.jsp
View File

@@ -417,13 +417,13 @@ white-space:nowrap;
<%-- <c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action" > --%>
<c:forEach items="${serviceList}" var="service" >
<%-- <c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}"> --%>
<c:if test="${service.serviceId ne 5}">
<c:if test="${bean.functionId ne 5}">
<c:if test="${(service.action ne 128) && (service.action ne 32) && (service.action ne 96) }" >
<form:option value="${service.serviceId}" ><spring:message code="${service.serviceName}"/></form:option>
</c:if>
</c:if>
<c:if test="${service.serviceId eq 5}">
<c:if test="${(service.action ne 128) && (service.action ne 96) }" >
<c:if test="${bean.functionId eq 5}">
<c:if test="${(service.action ne 128) && (service.action ne 96) && (service.serviceId ne 37) && (service.serviceId ne 149) }" >
<form:option value="${service.serviceId}" ><spring:message code="${service.serviceName}"/></form:option>
</c:if>
</c:if>