From 59b39f57ff76f774ddffe809ae0ba355877ecff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Fri, 3 Mar 2023 10:39:42 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91DictAspect?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/common/aspect/DictAspect.java | 178 +++++++++--------- 1 file changed, 88 insertions(+), 90 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java index 1e505fa1..1df699cb 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/DictAspect.java @@ -6,23 +6,21 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.extern.slf4j.Slf4j; -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Pointcut; import com.jero.common.api.CommonAPI; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.Dict; import com.jero.common.constant.CommonConstant; import com.jero.common.system.vo.DictModel; import com.jero.common.util.oConvertUtils; +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; -import java.lang.reflect.Field; -import java.text.SimpleDateFormat; import java.lang.reflect.Field; import java.text.SimpleDateFormat; @@ -46,9 +44,12 @@ public class DictAspect { @Autowired public RedisTemplate redisTemplate; + private static final String SYS_CACHE_DICT_S_S = "sys:cache:dict::%s:%s"; + // 定义切点Pointcut @Pointcut("execution(public * com.jero.modules..*.*Controller.*(..))") public void excudeService() { + // do other } @Around("excudeService()") @@ -87,99 +88,96 @@ public class DictAspect { * @param result */ private void parseDictText(Object result) { - if (result instanceof Result) { - if (((Result) result).getResult() instanceof IPage) { - List items = new ArrayList<>(); + if (result instanceof Result && ((Result) result).getResult() instanceof IPage) { + List items = new ArrayList<>(); - //step.1 筛选出加了 Dict 注解的字段列表 - List dictFieldList = new ArrayList<>(); - // 字典数据列表， key = 字典code，value=数据列表 - Map> dataListMap = new HashMap<>(); + //step.1 筛选出加了 Dict 注解的字段列表 + List dictFieldList = new ArrayList<>(); + // 字典数据列表， key = 字典code，value=数据列表 + Map> dataListMap = new HashMap<>(); - for (Object record : ((IPage) ((Result) result).getResult()).getRecords()) { - ObjectMapper mapper = new ObjectMapper(); - String json="{}"; - try { - //解决@JsonFormat注解解析不了的问题详见SysAnnouncement类的@JsonFormat - json = mapper.writeValueAsString(record); - } catch (JsonProcessingException e) { - log.error("json解析失败"+e.getMessage(),e); - } - JSONObject item = JSONObject.parseObject(json); - //update-begin--Author:scott -- Date:20190603 ----for：解决继承实体字段无法翻译问题------ - //for (Field field : record.getClass().getDeclaredFields()) { - // 遍历所有字段，把字典Code取出来，放到 map 里 - for (Field field : oConvertUtils.getAllFields(record)) { - String value = item.getString(field.getName()); - if (oConvertUtils.isEmpty(value)) { - continue; - } - //update-end--Author:scott -- Date:20190603 ----for：解决继承实体字段无法翻译问题------ - if (field.getAnnotation(Dict.class) != null) { - if (!dictFieldList.contains(field)) { - dictFieldList.add(field); - } - String code = field.getAnnotation(Dict.class).dicCode(); - String text = field.getAnnotation(Dict.class).dicText(); - String table = field.getAnnotation(Dict.class).dictTable(); - - List dataList; - String dictCode = code; - if (!StringUtils.isEmpty(table)) { - dictCode = String.format("%s,%s,%s", table, text, code); - } - dataList = dataListMap.computeIfAbsent(dictCode, k -> new ArrayList<>()); - this.listAddAllDeduplicate(dataList, Arrays.asList(value.split(","))); - } - //date类型默认转换string格式化日期 - if (field.getType().getName().equals("java.util.Date")&&field.getAnnotation(JsonFormat.class)==null&&item.get(field.getName())!=null){ - SimpleDateFormat aDate=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - item.put(field.getName(), aDate.format(new Date((Long) item.get(field.getName())))); - } - } - items.add(item); + for (Object record : ((IPage) ((Result) result).getResult()).getRecords()) { + ObjectMapper mapper = new ObjectMapper(); + String json="{}"; + try { + //解决@JsonFormat注解解析不了的问题详见SysAnnouncement类的@JsonFormat + json = mapper.writeValueAsString(record); + } catch (JsonProcessingException e) { + log.error("json解析失败"+e.getMessage(),e); } - - //step.2 调用翻译方法，一次性翻译 - Map> translText = this.translateAllDict(dataListMap); - - //step.3 将翻译结果填充到返回结果里 - for (JSONObject record : items) { - for (Field field : dictFieldList) { + JSONObject item = JSON.parseObject(json); + //update-begin--Author:scott -- Date:20190603 ----for：解决继承实体字段无法翻译问题------ + //for (Field field : record.getClass().getDeclaredFields()) { + // 遍历所有字段，把字典Code取出来，放到 map 里 + for (Field field : oConvertUtils.getAllFields(record)) { + String value = item.getString(field.getName()); + if (oConvertUtils.isEmpty(value)) { + continue; + } + //update-end--Author:scott -- Date:20190603 ----for：解决继承实体字段无法翻译问题------ + if (field.getAnnotation(Dict.class) != null) { + if (!dictFieldList.contains(field)) { + dictFieldList.add(field); + } String code = field.getAnnotation(Dict.class).dicCode(); String text = field.getAnnotation(Dict.class).dicText(); String table = field.getAnnotation(Dict.class).dictTable(); - String fieldDictCode = code; + List dataList; + String dictCode = code; if (!StringUtils.isEmpty(table)) { - fieldDictCode = String.format("%s,%s,%s", table, text, code); - } - - String value = record.getString(field.getName()); - if (oConvertUtils.isNotEmpty(value)) { - List dictModels = translText.get(fieldDictCode); - if(dictModels==null || dictModels.size()==0){ - continue; - } - - String textValue = this.translDictText(dictModels, value); - log.debug(" 字典Val : " + textValue); - log.debug(" __翻译字典字段__ " + field.getName() + CommonConstant.DICT_TEXT_SUFFIX + "： " + textValue); - - // TODO-sun 测试输出，待删 - log.debug(" ---- dictCode: " + fieldDictCode); - log.debug(" ---- value: " + value); - log.debug(" ----- text: " + textValue); - log.debug(" ---- dictModels: " + JSON.toJSONString(dictModels)); - - record.put(field.getName() + CommonConstant.DICT_TEXT_SUFFIX, textValue); + dictCode = String.format("%s,%s,%s", table, text, code); } + dataList = dataListMap.computeIfAbsent(dictCode, k -> new ArrayList<>()); + this.listAddAllDeduplicate(dataList, Arrays.asList(value.split(","))); + } + //date类型默认转换string格式化日期 + if (Date.class.isAssignableFrom(field.getType()) && field.getAnnotation(JsonFormat.class) == null && item.get(field.getName()) != null){ + SimpleDateFormat aDate=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + item.put(field.getName(), aDate.format(new Date((Long) item.get(field.getName())))); } } - - ((IPage) ((Result) result).getResult()).setRecords(items); + items.add(item); } + //step.2 调用翻译方法，一次性翻译 + Map> translText = this.translateAllDict(dataListMap); + + //step.3 将翻译结果填充到返回结果里 + for (JSONObject record : items) { + for (Field field : dictFieldList) { + String code = field.getAnnotation(Dict.class).dicCode(); + String text = field.getAnnotation(Dict.class).dicText(); + String table = field.getAnnotation(Dict.class).dictTable(); + + String fieldDictCode = code; + if (!StringUtils.isEmpty(table)) { + fieldDictCode = String.format("%s,%s,%s", table, text, code); + } + + String value = record.getString(field.getName()); + if (oConvertUtils.isNotEmpty(value)) { + List dictModels = translText.get(fieldDictCode); + if(dictModels==null || dictModels.size()==0){ + continue; + } + + String textValue = this.translDictText(dictModels, value); + log.debug(" 字典Val : " + textValue); + log.debug(" __翻译字典字段__ " + field.getName() + CommonConstant.DICT_TEXT_SUFFIX + "： " + textValue); + + // TODO-sun 测试输出，待删 + log.debug(" ---- dictCode: " + fieldDictCode); + log.debug(" ---- value: " + value); + log.debug(" ----- text: " + textValue); + log.debug(" ---- dictModels: " + JSON.toJSONString(dictModels)); + + record.put(field.getName() + CommonConstant.DICT_TEXT_SUFFIX, textValue); + } + } + } + + ((IPage) ((Result) result).getResult()).setRecords(items); } } @@ -232,7 +230,7 @@ public class DictAspect { needTranslDataTable.add(data); } } else { - String keyString = String.format("sys:cache:dict::%s:%s", dictCode, data); + String keyString = String.format(SYS_CACHE_DICT_S_S, dictCode, data); if (redisTemplate.hasKey(keyString)) { try { String text = oConvertUtils.getString(redisTemplate.opsForValue().get(keyString)); @@ -291,7 +289,7 @@ public class DictAspect { // 做 redis 缓存 for (DictModel dict : newList) { - String redisKey = String.format("sys:cache:dict::%s:%s", dictCode, dict.getValue()); + String redisKey = String.format(SYS_CACHE_DICT_S_S, dictCode, dict.getValue()); try { redisTemplate.opsForValue().set(redisKey, dict.getText()); } catch (Exception e) { @@ -363,7 +361,7 @@ public class DictAspect { tmpValue= commonAPI.translateDictFromTable(table,text,code,k.trim()); } }else { - String keyString = String.format("sys:cache:dict::%s:%s",code,k.trim()); + String keyString = String.format(SYS_CACHE_DICT_S_S,code,k.trim()); if (redisTemplate.hasKey(keyString)){ try { tmpValue = oConvertUtils.getString(redisTemplate.opsForValue().get(keyString));