wms / wms4_hh · Commits

Commit cc94ac8038e039e40bd408f533a0f267bb38681e

Authored by 谭毅彬
1 parent 3e06a537

接口日志显示优化 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 2 changed files with 24 additions and 23 deletions
ant-design-vue-jeecg/src/views/system/monitor/ApiLogList.vue
  View file @cc94ac8
... ... @@ -155,7 +155,7 @@ export default {
155 155 },
156 156 data() {
157 157 let ellipsis1 = (v, l = 20) => (<j-ellipsis value={v} length={l}/>)
158   - let ellipsis2 = (v, l = 150) => (<j-ellipsis value={v} length={l}/>)
  158 + let ellipsis2 = (v, l = 120) => (<j-ellipsis value={v} length={l}/>)
159 159 return {
160 160 description: '接口日志管理页面',
161 161 // 表头
... ... @@ -176,11 +176,6 @@ export default {
176 176 dataIndex: 'ip'
177 177 },
178 178 {
179   - title: '响应耗时（毫秒）',
180   - align: "center",
181   - dataIndex: 'duration'
182   - },
183   - {
184 179 title: '请求方名称',
185 180 align: "center",
186 181 dataIndex: 'requestFrom'
... ... @@ -193,17 +188,7 @@ export default {
193 188 {
194 189 title: '请求地址',
195 190 align: "left",
196   - dataIndex: 'url'
197   - },
198   - {
199   - title: '请求时间',
200   - align: "center",
201   - dataIndex: 'requestTime'
202   - },
203   - {
204   - title: '响应时间',
205   - align: "center",
206   - dataIndex: 'responseTime'
  191 + dataIndex: 'url',
207 192 },
208 193 {
209 194 title: '请求头',
... ... @@ -230,6 +215,21 @@ export default {
230 215 customRender: (t) => ellipsis2(t)
231 216 },
232 217 {
  218 + title: '请求时间',
  219 + align: "center",
  220 + dataIndex: 'requestTime'
  221 + },
  222 + {
  223 + title: '响应时间',
  224 + align: "center",
  225 + dataIndex: 'responseTime'
  226 + },
  227 + {
  228 + title: '响应耗时（毫秒）',
  229 + align: "center",
  230 + dataIndex: 'duration'
  231 + },
  232 + {
233 233 title: 'httpCode',
234 234 align: "center",
235 235 dataIndex: 'httpCode'
... ... @@ -249,7 +249,7 @@ export default {
249 249 dataIndex: 'action',
250 250 align: "center",
251 251 fixed: "right",
252   - width: 147,
  252 + width: 80,
253 253 scopedSlots: {customRender: 'action'}
254 254 }
255 255 ],
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
  View file @cc94ac8
... ... @@ -8,6 +8,7 @@ import java.util.*;
8 8 import javax.annotation.Resource;
9 9 import javax.sql.DataSource;
10 10  
  11 +import org.apache.commons.beanutils.ConvertUtils;
11 12 import org.apache.commons.lang.StringUtils;
12 13 import org.apache.shiro.SecurityUtils;
13 14 import org.jeecg.common.api.dto.OnlineAuthDTO;
... ... @@ -751,7 +752,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
751 752 @Override
752 753 public List<LoginUser> queryUserByNames(String[] userNames) {
753 754 QueryWrapper<SysUser> queryWrapper = new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0);
754   - queryWrapper.in("username", userNames);
  755 + queryWrapper.in("username", ConvertUtils.convert(userNames, String.class));
755 756 List<LoginUser> loginUsers = new ArrayList<>();
756 757 List<SysUser> sysUsers = userMapper.selectList(queryWrapper);
757 758 for (SysUser user : sysUsers) {
... ... @@ -901,14 +902,14 @@ public class SysBaseApiImpl implements ISysBaseAPI {
901 902 @Override
902 903 public List<JSONObject> queryUsersByUsernames(String usernames) {
903 904 LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
904   - queryWrapper.in(SysUser::getUsername, usernames.split(","));
  905 + queryWrapper.in(SysUser::getUsername, ConvertUtils.convert(usernames.split(","), String.class));
905 906 return JSON.parseArray(JSON.toJSONString(userMapper.selectList(queryWrapper))).toJavaList(JSONObject.class);
906 907 }
907 908  
908 909 @Override
909 910 public List<JSONObject> queryUsersByIds(String ids) {
910 911 LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
911   - queryWrapper.in(SysUser::getId, ids.split(","));
  912 + queryWrapper.in(SysUser::getId, ConvertUtils.convert(ids.split(","), Integer.class));
912 913 return JSON.parseArray(JSON.toJSONString(userMapper.selectList(queryWrapper))).toJavaList(JSONObject.class);
913 914 }
914 915  
... ... @@ -920,14 +921,14 @@ public class SysBaseApiImpl implements ISysBaseAPI {
920 921 @Override
921 922 public List<JSONObject> queryDepartsByOrgcodes(String orgCodes) {
922 923 LambdaQueryWrapper<SysDepart> queryWrapper = new LambdaQueryWrapper<>();
923   - queryWrapper.in(SysDepart::getOrgCode, orgCodes.split(","));
  924 + queryWrapper.in(SysDepart::getOrgCode, ConvertUtils.convert(orgCodes.split(","), String.class));
924 925 return JSON.parseArray(JSON.toJSONString(sysDepartService.list(queryWrapper))).toJavaList(JSONObject.class);
925 926 }
926 927  
927 928 @Override
928 929 public List<JSONObject> queryDepartsByIds(String ids) {
929 930 LambdaQueryWrapper<SysDepart> queryWrapper = new LambdaQueryWrapper<>();
930   - queryWrapper.in(SysDepart::getId, ids.split(","));
  931 + queryWrapper.in(SysDepart::getId, ConvertUtils.convert(ids.split(","),Integer.class));
931 932 return JSON.parseArray(JSON.toJSONString(sysDepartService.list(queryWrapper))).toJavaList(JSONObject.class);
932 933 }
933 934  
... ...