wms / wms4_shenzhenxinyi · Commits

Commit 4fa76442ef6b4e714dc5c5eba5ce8e76f5550b59

Authored by 谭毅彬
1 parent a04ddc15

页面样式优化，接口日志记录BUG修复 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 2 changed files with 33 additions and 13 deletions
ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiSomeContainer.vue
  View file @4fa7644
@@ -29,17 +29,17 @@ export default { @@ -29,17 +29,17 @@ export default {
29 return { 29 return {
30 url: {list: '/inventory/inventoryDetail/list'}, 30 url: {list: '/inventory/inventoryDetail/list'},
31 columns: [ 31 columns: [
32 - {title: '容器编码', align: 'center', width: '25%', dataIndex: 'containerCode'},  
33 - {title: '库位编码', align: 'center', width: '25%', dataIndex: 'locationCode'},  
34 - {title: '库区', align: 'center', width: '20%', dataIndex: 'zoneCode'},  
35 - {title: '物料编码', align: 'center', width: '20%', dataIndex: 'materialCode'},  
36 - {title: '物料名称', align: 'center', width: '20%', dataIndex: 'materialName'},  
37 - {title: '物料数量', align: 'center', width: '20%', dataIndex: 'qty'}, 32 + {title: '容器编码', align: 'center', width: '15%', dataIndex: 'containerCode'},
  33 + {title: '库位编码', align: 'center', width: '15%', dataIndex: 'locationCode'},
  34 + {title: '库区', align: 'center', width: '15%', dataIndex: 'zoneCode'},
  35 + {title: '物料编码', align: 'center', width: '15%', dataIndex: 'materialCode'},
  36 + {title: '物料名称', align: 'center', width: '15%', dataIndex: 'materialName'},
  37 + {title: '物料数量', align: 'center', width: '15%', dataIndex: 'qty'},
38 ], 38 ],
39 // 定义在这里的参数都是可以在外部传递覆盖的，可以更灵活的定制化使用的组件 39 // 定义在这里的参数都是可以在外部传递覆盖的，可以更灵活的定制化使用的组件
40 default: { 40 default: {
41 name: "编码", 41 name: "编码",
42 - width: 1200, 42 + width: 1300,
43 displayKey: 'containerCode', 43 displayKey: 'containerCode',
44 returnKeys: ['id', 'containerCode'], 44 returnKeys: ['id', 'containerCode'],
45 queryParamText: '容器编码', 45 queryParamText: '容器编码',
huaheng-wms-core/src/main/java/org/jeecg/utils/OkHttpUtils.java
  View file @4fa7644
@@ -149,17 +149,24 @@ public class OkHttpUtils { @@ -149,17 +149,24 @@ public class OkHttpUtils {
149 String errorString = 149 String errorString =
150 StrUtil.format("执行GET请求异常，url: {}，执行耗时：{}ms，异常信息：{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e)); 150 StrUtil.format("执行GET请求异常，url: {}，执行耗时：{}ms，异常信息：{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e));
151 ApiLoggerAspect.setApiLogException(apiLog, e); 151 ApiLoggerAspect.setApiLogException(apiLog, e);
152 - sendAnnouncement(apiLog, apiLog.getApiName() + "接口连接超时", errorString); 152 + sendAnnouncement(apiLog, apiLog.getApiName() + "接口连接异常", errorString);
153 throw new JeecgBootException(errorString, e); 153 throw new JeecgBootException(errorString, e);
154 } catch (SocketTimeoutException e) { 154 } catch (SocketTimeoutException e) {
155 String errorString = 155 String errorString =
156 StrUtil.format("执行GET请求异常，url: {}，执行耗时：{}ms，异常信息：{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e)); 156 StrUtil.format("执行GET请求异常，url: {}，执行耗时：{}ms，异常信息：{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e));
157 ApiLoggerAspect.setApiLogException(apiLog, e); 157 ApiLoggerAspect.setApiLogException(apiLog, e);
158 - sendAnnouncement(apiLog, apiLog.getApiName() + "接口响应超时", errorString); 158 + sendAnnouncement(apiLog, apiLog.getApiName() + "接口响应异常", errorString);
  159 + throw new JeecgBootException(errorString, e);
  160 + } catch (IOException e) {
  161 + String errorString =
  162 + StrUtil.format("执行GET请求异常，url: {}，执行耗时：{}ms，异常信息：{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e));
  163 + ApiLoggerAspect.setApiLogException(apiLog, e);
  164 + sendAnnouncement(apiLog, apiLog.getApiName() + "接口IO异常", errorString);
159 throw new JeecgBootException(errorString, e); 165 throw new JeecgBootException(errorString, e);
160 } catch (Exception e) { 166 } catch (Exception e) {
161 String errorString = 167 String errorString =
162 StrUtil.format("执行GET请求异常，url: {}，执行耗时：{}ms，异常信息：{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e)); 168 StrUtil.format("执行GET请求异常，url: {}，执行耗时：{}ms，异常信息：{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e));
  169 + ApiLoggerAspect.setApiLogException(apiLog, e);
163 sendAnnouncement(apiLog, apiLog.getApiName() + "接口执行异常", errorString); 170 sendAnnouncement(apiLog, apiLog.getApiName() + "接口执行异常", errorString);
164 throw new JeecgBootException(errorString, e); 171 throw new JeecgBootException(errorString, e);
165 } finally { 172 } finally {
@@ -210,17 +217,24 @@ public class OkHttpUtils { @@ -210,17 +217,24 @@ public class OkHttpUtils {
210 String errorString = 217 String errorString =
211 StrUtil.format("执行POST请求异常，url: {}，执行耗时：{}ms，异常信息：{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e)); 218 StrUtil.format("执行POST请求异常，url: {}，执行耗时：{}ms，异常信息：{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e));
212 ApiLoggerAspect.setApiLogException(apiLog, e); 219 ApiLoggerAspect.setApiLogException(apiLog, e);
213 - sendAnnouncement(apiLog, apiLog.getApiName() + "接口连接超时", errorString); 220 + sendAnnouncement(apiLog, apiLog.getApiName() + "接口连接异常", errorString);
214 throw new JeecgBootException(errorString, e); 221 throw new JeecgBootException(errorString, e);
215 } catch (SocketTimeoutException e) { 222 } catch (SocketTimeoutException e) {
216 String errorString = 223 String errorString =
217 StrUtil.format("执行POST请求异常，url: {}，执行耗时：{}ms，异常信息：{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e)); 224 StrUtil.format("执行POST请求异常，url: {}，执行耗时：{}ms，异常信息：{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e));
218 ApiLoggerAspect.setApiLogException(apiLog, e); 225 ApiLoggerAspect.setApiLogException(apiLog, e);
219 - sendAnnouncement(apiLog, apiLog.getApiName() + "接口响应超时", errorString); 226 + sendAnnouncement(apiLog, apiLog.getApiName() + "接口响应异常", errorString);
  227 + throw new JeecgBootException(errorString, e);
  228 + } catch (IOException e) {
  229 + String errorString =
  230 + StrUtil.format("执行POST请求异常，url: {}，执行耗时：{}ms，异常信息：{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e));
  231 + ApiLoggerAspect.setApiLogException(apiLog, e);
  232 + sendAnnouncement(apiLog, apiLog.getApiName() + "接口IO异常", errorString);
220 throw new JeecgBootException(errorString, e); 233 throw new JeecgBootException(errorString, e);
221 } catch (Exception e) { 234 } catch (Exception e) {
222 String errorString = 235 String errorString =
223 StrUtil.format("执行POST请求异常，url: {}，执行耗时：{}ms，异常信息：{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e)); 236 StrUtil.format("执行POST请求异常，url: {}，执行耗时：{}ms，异常信息：{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e));
  237 + ApiLoggerAspect.setApiLogException(apiLog, e);
224 sendAnnouncement(apiLog, apiLog.getApiName() + "接口执行异常", errorString); 238 sendAnnouncement(apiLog, apiLog.getApiName() + "接口执行异常", errorString);
225 throw new JeecgBootException(errorString, e); 239 throw new JeecgBootException(errorString, e);
226 } finally { 240 } finally {
@@ -262,13 +276,19 @@ public class OkHttpUtils { @@ -262,13 +276,19 @@ public class OkHttpUtils {
262 String errorString = 276 String errorString =
263 StrUtil.format("执行POST请求异常，url: {}，执行耗时：{}ms，异常信息：{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e)); 277 StrUtil.format("执行POST请求异常，url: {}，执行耗时：{}ms，异常信息：{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e));
264 ApiLoggerAspect.setApiLogException(apiLog, e); 278 ApiLoggerAspect.setApiLogException(apiLog, e);
265 - sendAnnouncement(apiLog, apiLog.getApiName() + "接口连接超时", errorString); 279 + sendAnnouncement(apiLog, apiLog.getApiName() + "接口连接异常", errorString);
266 throw new JeecgBootException(errorString, e); 280 throw new JeecgBootException(errorString, e);
267 } catch (SocketTimeoutException e) { 281 } catch (SocketTimeoutException e) {
268 String errorString = 282 String errorString =
269 StrUtil.format("执行POST请求异常，url: {}，执行耗时：{}ms，异常信息：{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e)); 283 StrUtil.format("执行POST请求异常，url: {}，执行耗时：{}ms，异常信息：{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e));
270 ApiLoggerAspect.setApiLogException(apiLog, e); 284 ApiLoggerAspect.setApiLogException(apiLog, e);
271 - sendAnnouncement(apiLog, apiLog.getApiName() + "接口响应超时", errorString); 285 + sendAnnouncement(apiLog, apiLog.getApiName() + "接口响应异常", errorString);
  286 + throw new JeecgBootException(errorString, e);
  287 + } catch (IOException e) {
  288 + String errorString =
  289 + StrUtil.format("执行POST请求异常，url: {}，执行耗时：{}ms，异常信息：{}", url, new Date().getTime() - apiLog.getRequestTime().getTime(), ExceptionUtil.getMessage(e));
  290 + ApiLoggerAspect.setApiLogException(apiLog, e);
  291 + sendAnnouncement(apiLog, apiLog.getApiName() + "接口IO异常", errorString);
272 throw new JeecgBootException(errorString, e); 292 throw new JeecgBootException(errorString, e);
273 } catch (Exception e) { 293 } catch (Exception e) {
274 String errorString = 294 String errorString =