diff --git a/ant-design-vue-jeecg/src/views/system/monitor/ApiLogList.vue b/ant-design-vue-jeecg/src/views/system/monitor/ApiLogList.vue index 9dc5865..c248967 100644 --- a/ant-design-vue-jeecg/src/views/system/monitor/ApiLogList.vue +++ b/ant-design-vue-jeecg/src/views/system/monitor/ApiLogList.vue @@ -155,7 +155,7 @@ export default { }, data() { let ellipsis1 = (v, l = 20) => (<j-ellipsis value={v} length={l}/>) - let ellipsis2 = (v, l = 150) => (<j-ellipsis value={v} length={l}/>) + let ellipsis2 = (v, l = 120) => (<j-ellipsis value={v} length={l}/>) return { description: '接口日志管理页面', // 表头 @@ -170,12 +170,6 @@ export default { align: "center", dataIndex: 'apiMethod' }, - { - title: '响应耗时(毫秒)', - align: "center", - dataIndex: 'duration' - }, - { title: '请求内容', align: "left", dataIndex: 'requestBody', @@ -205,9 +199,8 @@ export default { { title: '请求地址', align: "left", - dataIndex: 'url' + dataIndex: 'url', }, - { title: '请求时间', align: "center", dataIndex: 'requestTime' @@ -218,6 +211,11 @@ export default { dataIndex: 'responseTime' }, { + title: '响应耗时(毫秒)', + align: "center", + dataIndex: 'duration' + }, + { title: 'httpCode', align: "center", dataIndex: 'httpCode' @@ -237,7 +235,7 @@ export default { dataIndex: 'action', align: "center", fixed: "right", - width: 147, + width: 80, scopedSlots: {customRender: 'action'} } ], diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index e82844b..2d5898a 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -8,6 +8,7 @@ import java.util.*; import javax.annotation.Resource; import javax.sql.DataSource; +import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.dto.OnlineAuthDTO; @@ -751,7 +752,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @Override public List<LoginUser> queryUserByNames(String[] userNames) { QueryWrapper<SysUser> queryWrapper = new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0); - queryWrapper.in("username", userNames); + queryWrapper.in("username", ConvertUtils.convert(userNames, String.class)); List<LoginUser> loginUsers = new ArrayList<>(); List<SysUser> sysUsers = userMapper.selectList(queryWrapper); for (SysUser user : sysUsers) { @@ -901,14 +902,14 @@ public class SysBaseApiImpl implements ISysBaseAPI { @Override public List<JSONObject> queryUsersByUsernames(String usernames) { LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysUser::getUsername, usernames.split(",")); + queryWrapper.in(SysUser::getUsername, ConvertUtils.convert(usernames.split(","), String.class)); return JSON.parseArray(JSON.toJSONString(userMapper.selectList(queryWrapper))).toJavaList(JSONObject.class); } @Override public List<JSONObject> queryUsersByIds(String ids) { LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysUser::getId, ids.split(",")); + queryWrapper.in(SysUser::getId, ConvertUtils.convert(ids.split(","), Integer.class)); return JSON.parseArray(JSON.toJSONString(userMapper.selectList(queryWrapper))).toJavaList(JSONObject.class); } @@ -920,14 +921,14 @@ public class SysBaseApiImpl implements ISysBaseAPI { @Override public List<JSONObject> queryDepartsByOrgcodes(String orgCodes) { LambdaQueryWrapper<SysDepart> queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysDepart::getOrgCode, orgCodes.split(",")); + queryWrapper.in(SysDepart::getOrgCode, ConvertUtils.convert(orgCodes.split(","), String.class)); return JSON.parseArray(JSON.toJSONString(sysDepartService.list(queryWrapper))).toJavaList(JSONObject.class); } @Override public List<JSONObject> queryDepartsByIds(String ids) { LambdaQueryWrapper<SysDepart> queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysDepart::getId, ids.split(",")); + queryWrapper.in(SysDepart::getId, ConvertUtils.convert(ids.split(","),Integer.class)); return JSON.parseArray(JSON.toJSONString(sysDepartService.list(queryWrapper))).toJavaList(JSONObject.class); }