From b4645daf2a9943afb4603e30eef1897cdca157c5 Mon Sep 17 00:00:00 2001 From: zlyx <1242874891@qq.com> Date: 星期一, 06 三月 2023 13:07:05 +0800 Subject: [PATCH] add 新增 迁移 4.X EasyExcel枚举类数据翻译注解功能 ; fix 修正 !pr292 相关问题, 回退特殊类转换写法 ; --- ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisEncryptInterceptor.java | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisEncryptInterceptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisEncryptInterceptor.java index 97fc0a4..28793cc 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisEncryptInterceptor.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/interceptor/MybatisEncryptInterceptor.java @@ -49,9 +49,8 @@ @Override public Object plugin(Object target) { - if (target instanceof ParameterHandler) { + if (target instanceof ParameterHandler parameterHandler) { // 杩涜鍔犲瘑鎿嶄綔 - ParameterHandler parameterHandler = (ParameterHandler) target; Object parameterObject = parameterHandler.getParameterObject(); if (ObjectUtil.isNotNull(parameterObject) && !(parameterObject instanceof String)) { this.encryptHandler(parameterObject); @@ -65,19 +64,18 @@ * * @param sourceObject 寰呭姞瀵嗗璞� */ - @SuppressWarnings("unchecked cast") private void encryptHandler(Object sourceObject) { - if (sourceObject instanceof Map) { - ((Map<?, Object>) sourceObject).values().forEach(this::encryptHandler); + if (sourceObject instanceof Map<?, ?> map) { + map.values().forEach(this::encryptHandler); return; } - if (sourceObject instanceof List) { + if (sourceObject instanceof List<?> list) { // 鍒ゆ柇绗竴涓厓绱犳槸鍚﹀惈鏈夋敞瑙c�傚鏋滄病鏈夌洿鎺ヨ繑鍥烇紝鎻愰珮鏁堢巼 - Object firstItem = ((List<?>) sourceObject).get(0); + Object firstItem = list.get(0); if (CollectionUtil.isEmpty(encryptorManager.getFieldCache(firstItem.getClass()))) { return; } - ((List<?>) sourceObject).forEach(this::encryptHandler); + list.forEach(this::encryptHandler); return; } Set<Field> fields = encryptorManager.getFieldCache(sourceObject.getClass()); -- Gitblit v1.9.3