diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java index 0450aef0..db6b014d 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java @@ -20,7 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import com.beust.jcommander.internal.Lists; @@ -80,11 +79,13 @@ public class OnlineController extends BaseController{ @RequiresPermissions("sys:online:view") @RequestMapping(value = "listData") @ResponseBody - public List> listData(@RequestParam(defaultValue="true") Boolean excludeLeave, - @RequestParam(defaultValue="true") Boolean excludeVisitor, String sessionId, String userCode, - String userName, String userType, String orderBy) { + public List> listData(String isAllOnline, String isVisitor, String sessionId, + String userCode, String userName, String userType, String orderBy) { List> list = Lists.newArrayList(); - Collection sessions = sessionDAO.getActiveSessions(excludeLeave, excludeVisitor, null, sessionId, userCode); + boolean excludeLeave = isAllOnline==null || !Global.YES.equals(isAllOnline); + boolean excludeVisitor = isVisitor==null || !Global.YES.equals(isVisitor); + Collection sessions = sessionDAO.getActiveSessions(excludeLeave, + excludeVisitor, null, sessionId, userCode); long currentTime = System.currentTimeMillis(); for (Session session : sessions){ if (StringUtils.isNotBlank(userName) && ((String)session.getAttribute("userName")).contains(userName)){ diff --git a/modules/core/src/main/resources/views/modules/sys/areaList.html b/modules/core/src/main/resources/views/modules/sys/areaList.html index 1f8dc911..95a4e58b 100644 --- a/modules/core/src/main/resources/views/modules/sys/areaList.html +++ b/modules/core/src/main/resources/views/modules/sys/areaList.html @@ -16,13 +16,13 @@
- <#form:form id="searchForm" model="${area}" action="${ctx}/sys/area/listData" method="post" class="form-inline hide" - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> -
- -
- <#form:input path="areaCode" maxlength="100" class="form-control"/> -
+ <#form:form id="searchForm" model="${area}" action="${ctx}/sys/area/listData" method="post" class="form-inline hide" + data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> +
+ +
+ <#form:input path="areaCode" maxlength="100" class="form-control"/> +
@@ -35,11 +35,11 @@
<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/>
-
-
- - -
+
+
+ + +
@@ -52,7 +52,7 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ {header:'区域名称', name:'areaName', index:'a.area_name', width:230, align:"left", frozen:true, formatter: function(val, obj, row, act){ - return '( '+row.areaCode+' ) '+''+(val ? val : row.id)+''; + return '( '+row.areaCode+' ) '+''+(val||row.id)+''; }}, {header:'区域类型', name:'areaType', index:'a.area_type', width:150, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_area_type')}, val, '未知', true); diff --git a/modules/core/src/main/resources/views/modules/sys/companyList.html b/modules/core/src/main/resources/views/modules/sys/companyList.html index c7ce99b0..d2e17a95 100644 --- a/modules/core/src/main/resources/views/modules/sys/companyList.html +++ b/modules/core/src/main/resources/views/modules/sys/companyList.html @@ -16,36 +16,36 @@
- <#form:form id="searchForm" model="${company}" action="${ctx}/sys/company/listData" method="post" class="form-inline hide" - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> + <#form:form id="searchForm" model="${company}" action="${ctx}/sys/company/listData" method="post" class="form-inline hide" + data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
<#form:input path="viewCode" maxlength="100" class="form-control width-120"/>
-
- -
- <#form:input path="companyName" maxlength="200" class="form-control width-120"/> -
-
-
- -
- <#form:input path="fullName" maxlength="200" class="form-control width-120"/> -
-
-
- -
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> -
-
-
- - -
+
+ +
+ <#form:input path="companyName" maxlength="200" class="form-control width-120"/> +
+
+
+ +
+ <#form:input path="fullName" maxlength="200" class="form-control width-120"/> +
+
+
+ +
+ <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> +
+
+
+ + +
@@ -58,7 +58,7 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ {header:'公司名称', name:'companyName', index:'a.company_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){ - return '( '+row.viewCode+' ) '+''+(val ? val : row.id)+''; + return '( '+row.viewCode+' ) '+''+(val||row.id)+''; }}, {header:'公司全称', name:'fullName', index:'a.full_name', width:200, align:"left"}, {header:'排序号', name:'treeSort', index:'a.tree_sort', width:80, align:"center"}, diff --git a/modules/core/src/main/resources/views/modules/sys/dictDataList.html b/modules/core/src/main/resources/views/modules/sys/dictDataList.html index 6d12a7d7..aca64732 100644 --- a/modules/core/src/main/resources/views/modules/sys/dictDataList.html +++ b/modules/core/src/main/resources/views/modules/sys/dictDataList.html @@ -1,102 +1,102 @@ -<% layout('/layouts/default.html', {title: '字典数据管理', libs: ['dataGrid']}){ %> -
-
-
-
- 字典数据（${dictData.dictType}） -
-
- 查询 - 刷新 - 展开 - 折叠 - <% if(hasPermi('sys:dictData:edit')){ %> - 新增 - <% } %> -
-
-
- <#form:form id="searchForm" model="${dictData}" action="${ctx}/sys/dictData/listData" method="post" class="form-inline " - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> -
- -
- <#form:input path="dictLabel" maxlength="100" class="form-control"/> -
-
-
- -
- <#form:input path="dictValue" maxlength="100" class="form-control"/> -
-
-
- -
- <#form:input path="dictType" maxlength="100" class="form-control"/> -
-
-
- -
- <#form:select path="isSys" dictType="sys_yes_no" blankOption="true" class="form-control"/> -
-
-
- -
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> -
-
-
- - -
- -
-
-
-
-<% } %> - \ No newline at end of file diff --git a/modules/core/src/main/resources/views/modules/sys/dictTypeList.html b/modules/core/src/main/resources/views/modules/sys/dictTypeList.html index c554f67a..fa5974e0 100644 --- a/modules/core/src/main/resources/views/modules/sys/dictTypeList.html +++ b/modules/core/src/main/resources/views/modules/sys/dictTypeList.html @@ -1,95 +1,95 @@ -<% layout('/layouts/default.html', {title: '字典管理', libs: ['dataGrid']}){ %> -
-
-
-
- 字典管理 -
-
- 查询 - <% if(hasPermi('sys:dictType:edit')){ %> - 新增 - <% } %> -
-
-
- <#form:form id="searchForm" model="${dictType}" action="${ctx}/sys/dictType/listData" method="post" class="form-inline " - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> -
- -
- <#form:input path="dictName" maxlength="100" class="form-control"/> -
-
-
- -
- <#form:input path="dictType_like" maxlength="100" class="form-control"/> -
-
-
- -
- <#form:select path="isSys" dictType="sys_yes_no" blankOption="true" class="form-control"/> -
-
-
- -
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> -
-
-
- - -
- -
-
-
-
-
-<% } %> - \ No newline at end of file diff --git a/modules/core/src/main/resources/views/modules/sys/logList.html b/modules/core/src/main/resources/views/modules/sys/logList.html index 142ce665..a8214b03 100644 --- a/modules/core/src/main/resources/views/modules/sys/logList.html +++ b/modules/core/src/main/resources/views/modules/sys/logList.html @@ -7,9 +7,6 @@
查询 - <% if(hasPermi('sys:log:edit')){ %> - 新增 - <% } %>
@@ -33,12 +30,6 @@ <#form:select path="logType" dictType="sys_log_type" blankOption="true" class="form-control required " />
- - - - - -
@@ -82,24 +73,6 @@ <#form:input path="remoteAddr" maxlength="255" class="form-control width-90"/>
- - - - - - - - - - - - - - - - - -
@@ -117,7 +90,7 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ {header:'日志标题', name:'logTitle', index:'a.log_title', width:200, align:"left", frozen:true, formatter: function(val, obj, row, act){ - return ''+(val ? val : row.id)+''; + return ''+(val||row.id)+''; }}, {header:'请求地址', name:'requestUri', index:'a.request_uri', width:260, align:"left", formatter: function(val, obj, row, act){ return ''+ row.requestUri; diff --git a/modules/core/src/main/resources/views/modules/sys/officeList.html b/modules/core/src/main/resources/views/modules/sys/officeList.html index b41db7ca..072e7bcc 100644 --- a/modules/core/src/main/resources/views/modules/sys/officeList.html +++ b/modules/core/src/main/resources/views/modules/sys/officeList.html @@ -16,42 +16,42 @@
- <#form:form id="searchForm" model="${office}" action="${ctx}/sys/office/listData" method="post" class="form-inline hide" - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> -
- -
- <#form:input path="viewCode" maxlength="100" class="form-control width-120"/> -
-
-
- -
- <#form:input path="officeName" maxlength="100" class="form-control width-120"/> -
-
-
- -
- <#form:input path="fullName" maxlength="200" class="form-control width-120"/> -
-
-
- -
- <#form:select path="officeType" dictType="sys_office_type" blankOption="true" class="form-control"/> -
-
-
- -
- <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> -
-
-
- - -
+ <#form:form id="searchForm" model="${office}" action="${ctx}/sys/office/listData" method="post" class="form-inline hide" + data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> +
+ +
+ <#form:input path="viewCode" maxlength="100" class="form-control width-120"/> +
+
+
+ +
+ <#form:input path="officeName" maxlength="100" class="form-control width-120"/> +
+
+
+ +
+ <#form:input path="fullName" maxlength="200" class="form-control width-120"/> +
+
+
+ +
+ <#form:select path="officeType" dictType="sys_office_type" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> +
+
+
+ + +
@@ -64,7 +64,7 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ {header:'机构名称', name:'officeName', index:'a.office_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){ - return '( '+row.viewCode+' ) '+''+(val ? val : row.id)+''; + return '( '+row.viewCode+' ) '+''+(val||row.id)+''; }}, {header:'机构全称', name:'fullName', index:'a.full_name', width:200, align:"left"}, {header:'排序号', name:'treeSort', index:'a.tree_sort', width:80, align:"center"}, diff --git a/modules/core/src/main/resources/views/modules/sys/onlineList.html b/modules/core/src/main/resources/views/modules/sys/onlineList.html new file mode 100644 index 00000000..ae0cd7a8 --- /dev/null +++ b/modules/core/src/main/resources/views/modules/sys/onlineList.html @@ -0,0 +1,77 @@ +<% layout('/layouts/default.html', {title: '在线用户', libs: ['dataGrid']}){ %> +
+
+
+
+ 在线用户 +
+
+ 查询 +
+
+
+ <#form:form id="searchForm" action="${ctx}/sys/online/listData" method="post" class="form-inline hide" + data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> +
+ +
+ <#form:listselect id="userSelect" title="用户" path="userCode" + url="${ctx}/sys/user/userSelect?userType=" allowClear="false" + checkbox="false" itemCode="userCode" itemName="userName"/> +
+
+
+
  + <#form:checkbox name="isAllOnline" value="false" label="查询所有在线" + class="form-control"/> +
+
+
+
+ <#form:checkbox name="isVisitor" value="false" label="查询游客用户" + class="form-control"/> +
+
+
+ + +
+ +
+
+
+
+
+<% } %> + \ No newline at end of file diff --git a/modules/core/src/main/resources/views/modules/sys/postList.html b/modules/core/src/main/resources/views/modules/sys/postList.html index 8339ba10..aede9639 100644 --- a/modules/core/src/main/resources/views/modules/sys/postList.html +++ b/modules/core/src/main/resources/views/modules/sys/postList.html @@ -13,36 +13,36 @@
- <#form:form id="searchForm" model="${post}" action="${ctx}/sys/post/listData" method="post" class="form-inline hide" - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> -
- -
- <#form:input path="postCode" maxlength="64" class="form-control width-120"/> -
-
-
- -
- <#form:input path="postName" maxlength="100" class="form-control width-120"/> -
-
-
- -
- <#form:select path="postType" dictType="sys_post_type" blankOption="true" class="form-control"/> -
+ <#form:form id="searchForm" model="${post}" action="${ctx}/sys/post/listData" method="post" class="form-inline hide" + data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> +
+ +
+ <#form:input path="postCode" maxlength="64" class="form-control width-120"/> +
+
+
+ +
+ <#form:input path="postName" maxlength="100" class="form-control width-120"/> +
+
+
+ +
+ <#form:select path="postType" dictType="sys_post_type" blankOption="true" class="form-control"/> +
<#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/>
-
-
- - -
+
+
+ + +
@@ -56,7 +56,7 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ {header:'岗位名称', name:'postName', index:'a.post_name', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){ - return ''+(val ? val : row.id)+''; + return ''+(val||row.id)+''; }}, {header:'岗位编码', name:'postCode', index:'a.post_code', width:200, align:"center"}, {header:'排序号', name:'postSort', index:'a.post_sort', width:80, align:"center"}, diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html index 0aeae6d0..a56456dc 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html @@ -17,19 +17,19 @@
- <#form:form id="searchForm" model="${user}" action="${ctx}/sys/corpAdmin/listData" method="post" class="form-inline " - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> -
- -
- <#form:input path="loginCode" maxlength="100" class="form-control width-90"/> -
-
-
- -
- <#form:input path="userName" maxlength="100" class="form-control width-90"/> -
+ <#form:form id="searchForm" model="${user}" action="${ctx}/sys/corpAdmin/listData" method="post" class="form-inline " + data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> +
+ +
+ <#form:input path="loginCode" maxlength="100" class="form-control width-90"/> +
+
+
+ +
+ <#form:input path="userName" maxlength="100" class="form-control width-90"/> +
@@ -48,10 +48,10 @@
<#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control"/>
-
-
- - +
+
+ +
@@ -66,7 +66,7 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ {header:'登录账号', name:'loginCode', index:'a.login_code', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){ - return ''+(val ? val : row.id)+''; + return ''+(val||row.id)+''; }}, {header:'用户昵称', name:'userName', index:'a.user_name', width:200, align:"center"}, <% if(@ObjectUtils.toBoolean(@Global.getConfig('user.useCorpModel'))){ %> diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html index d0ed30d6..68fef433 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html @@ -13,44 +13,44 @@
- <#form:form id="searchForm" model="${empUser}" action="${ctx}/sys/empUser/listData" method="post" class="form-inline " - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> -
- -
- <#form:input path="loginCode" maxlength="100" class="form-control width-90"/> -
+ <#form:form id="searchForm" model="${empUser}" action="${ctx}/sys/empUser/listData" method="post" class="form-inline " + data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> +
+ +
+ <#form:input path="loginCode" maxlength="100" class="form-control width-90"/> +
+
+
+ +
+ <#form:input path="userName" maxlength="100" class="form-control width-90"/> +
+
+
+ +
+ <#form:input path="email" maxlength="300" class="form-control width-90"/> +
+
+
+ +
+ <#form:input path="mobile" maxlength="100" class="form-control width-90"/> +
+
+
+ +
+ <#form:input path="phone" maxlength="100" class="form-control width-90"/> +
-
- -
- <#form:input path="userName" maxlength="100" class="form-control width-90"/> -
-
-
- -
- <#form:input path="email" maxlength="300" class="form-control width-90"/> -
-
-
- -
- <#form:input path="mobile" maxlength="100" class="form-control width-90"/> -
-
-
- -
- <#form:input path="phone" maxlength="100" class="form-control width-90"/> -
-
-
-
- -
- <#form:input path="refName" maxlength="100" class="form-control width-90"/> -
+
+
+ +
+ <#form:input path="refName" maxlength="100" class="form-control width-90"/> +
@@ -80,10 +80,10 @@
<#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control"/>
-
-
- - +
+
+ +
@@ -98,7 +98,7 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ {header:'登录账号', name:'loginCode', index:'a.login_code', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){ - return ''+(val ? val : row.id)+''; + return ''+(val||row.id)+''; }}, {header:'用户昵称', name:'userName', index:'a.user_name', width:200, align:"center"}, {header:'用户姓名', name:'refName', index:'a.ref_name', width:200, align:"center"}, diff --git a/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html b/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html index 7f08e65c..43aac542 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html @@ -11,19 +11,19 @@
- <#form:form id="searchForm" model="${user}" action="${ctx}/sys/secAdmin/listData" method="post" class="form-inline " - data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> -
- -
- <#form:input path="loginCode" maxlength="100" class="form-control width-90"/> -
-
-
- -
- <#form:input path="userName" maxlength="100" class="form-control width-90"/> -
+ <#form:form id="searchForm" model="${user}" action="${ctx}/sys/secAdmin/listData" method="post" class="form-inline " + data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> +
+ +
+ <#form:input path="loginCode" maxlength="100" class="form-control width-90"/> +
+
+
+ +
+ <#form:input path="userName" maxlength="100" class="form-control width-90"/> +
@@ -42,16 +42,16 @@
<#form:input path="phone" maxlength="100" class="form-control width-90"/>
-
+
<#form:select path="status" dictType="sys_user_status" blankOption="true" class="form-control"/>
-
-
- - +
+
+ +
@@ -70,7 +70,7 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ {header:'登录账号', name:'loginCode', index:'a.login_code', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){ - return ''+(val ? val : row.id)+''; + return ''+(val||row.id)+''; }}, {header:'用户昵称', name:'userName', index:'a.user_name', width:200, align:"center"}, {header:'电子邮箱', name:'email', index:'a.email', width:200, align:"center"},