| | |
| | | |
| | | @Around("excudeService()") |
| | | public Object doAround(ProceedingJoinPoint pjp) throws Throwable { |
| | | long time1=System.currentTimeMillis(); |
| | | long time1 = System.currentTimeMillis(); |
| | | Object result = pjp.proceed(); |
| | | long time2=System.currentTimeMillis(); |
| | | log.debug("è·åJSONæ°æ® èæ¶ï¼"+(time2-time1)+"ms"); |
| | | long start=System.currentTimeMillis(); |
| | | result=this.parseDictText(result); |
| | | long end=System.currentTimeMillis(); |
| | | log.debug("注å
¥åå
¸å°JSONæ°æ® èæ¶"+(end-start)+"ms"); |
| | | long time2 = System.currentTimeMillis(); |
| | | log.debug("è·åJSONæ°æ® èæ¶ï¼" + (time2 - time1) + "ms"); |
| | | long start = System.currentTimeMillis(); |
| | | result = this.parseDictText(result); |
| | | long end = System.currentTimeMillis(); |
| | | log.debug("注å
¥åå
¸å°JSONæ°æ® èæ¶" + (end - start) + "ms"); |
| | | return result; |
| | | } |
| | | |
| | |
| | | * 示ä¾ä¸ºSysUser åæ®µä¸ºsex æ·»å äºæ³¨è§£@Dict(dicCode = "sex") ä¼å¨åå
¸æå¡ç«é©¬æ¥åºæ¥å¯¹åºçtext ç¶åå¨è¯·æ±listçæ¶åå°è¿ä¸ªåå
¸textï¼å·²å段åç§°å _dictTextå½¢å¼è¿åå°å端 |
| | | * ä¾è¾å
¥å½åè¿åå¼çå°±ä¼å¤åºä¸ä¸ªsex_dictTextåæ®µ |
| | | * { |
| | | * sex:1, |
| | | * sex_dictText:"ç·" |
| | | * sex:1, |
| | | * sex_dictText:"ç·" |
| | | * } |
| | | * åç«¯ç´æ¥åå¼sext_dictTextå¨tableé颿 éåè¿è¡å端çåå
¸è½¬æ¢äº |
| | | * customRender:function (text) { |
| | | * if(text==1){ |
| | | * return "ç·"; |
| | | * }else if(text==2){ |
| | | * return "女"; |
| | | * }else{ |
| | | * return text; |
| | | * } |
| | | * } |
| | | * ç®åvueæ¯è¿ä¹è¿è¡åå
¸æ¸²æå°tableä¸çå¤äºå°±å¾éº»ç¦äº è¿ä¸ªç´æ¥å¨æå¡ç«¯æ¸²æå®æå端å¯ä»¥ç´æ¥ç¨ |
| | | * customRender:function (text) { |
| | | * if(text==1){ |
| | | * return "ç·"; |
| | | * }else if(text==2){ |
| | | * return "女"; |
| | | * }else{ |
| | | * return text; |
| | | * } |
| | | * } |
| | | * ç®åvueæ¯è¿ä¹è¿è¡åå
¸æ¸²æå°tableä¸çå¤äºå°±å¾éº»ç¦äº è¿ä¸ªç´æ¥å¨æå¡ç«¯æ¸²æå®æå端å¯ä»¥ç´æ¥ç¨ |
| | | * |
| | | * @param result |
| | | */ |
| | | private Object parseDictText(Object result) { |
| | |
| | | // åå
¸æ°æ®åè¡¨ï¼ key = åå
¸codeï¼value=æ°æ®å表 |
| | | Map<String, List<String>> dataListMap = new HashMap<>(5); |
| | | //ååºç»æé |
| | | List<Object> records=((IPage) ((Result) result).getResult()).getRecords(); |
| | | List<Object> records = ((IPage) ((Result) result).getResult()).getRecords(); |
| | | //update-begin--Author:zyf -- Date:20220606 ----forï¼ãVUEN-1230ã 夿æ¯å¦å«æåå
¸æ³¨è§£,æ²¡ææ³¨è§£è¿å----- |
| | | Boolean hasDict= checkHasDict(records); |
| | | if(!hasDict){ |
| | | Boolean hasDict = checkHasDict(records); |
| | | if (!hasDict) { |
| | | return result; |
| | | } |
| | | |
| | | log.debug(" __ è¿å
¥åå
¸ç¿»è¯åé¢ DictAspect ââ " ); |
| | | //update-end--Author:zyf -- Date:20220606 ----forï¼ãVUEN-1230ã 夿æ¯å¦å«æåå
¸æ³¨è§£,æ²¡ææ³¨è§£è¿å----- |
| | | for (Object record : records) { |
| | | String json="{}"; |
| | | try { |
| | | //update-begin--Author:zyf -- Date:20220531 ----forï¼ãissues/#3629ã DictAspect Jacksonåºå忥é----- |
| | | //è§£å³@JsonFormat注解解æä¸äºçé®é¢è¯¦è§SysAnnouncementç±»ç@JsonFormat |
| | | json = objectMapper.writeValueAsString(record); |
| | | //update-end--Author:zyf -- Date:20220531 ----forï¼ãissues/#3629ã DictAspect Jacksonåºå忥é----- |
| | | } catch (JsonProcessingException e) { |
| | | log.error("jsonè§£æå¤±è´¥"+e.getMessage(),e); |
| | | } |
| | | //update-begin--Author:scott -- Date:20211223 ----forï¼ãissues/3303ãrestcontrollerè¿åjsonæ°æ®åkey顺åºéä¹± ----- |
| | | JSONObject item = JSONObject.parseObject(json, Feature.OrderedField); |
| | | //update-end--Author:scott -- Date:20211223 ----forï¼ãissues/3303ãrestcontrollerè¿åjsonæ°æ®åkey顺åºéä¹± ----- |
| | | |
| | | //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); |
| | | log.debug(" __ è¿å
¥åå
¸ç¿»è¯åé¢ DictAspect ââ "); |
| | | //update-end--Author:zyf -- Date:20220606 ----forï¼ãVUEN-1230ã 夿æ¯å¦å«æåå
¸æ³¨è§£,æ²¡ææ³¨è§£è¿å----- |
| | | for (Object record : records) { |
| | | String json = "{}"; |
| | | try { |
| | | //update-begin--Author:zyf -- Date:20220531 ----forï¼ãissues/#3629ã DictAspect Jacksonåºå忥é----- |
| | | //è§£å³@JsonFormat注解解æä¸äºçé®é¢è¯¦è§SysAnnouncementç±»ç@JsonFormat |
| | | json = objectMapper.writeValueAsString(record); |
| | | //update-end--Author:zyf -- Date:20220531 ----forï¼ãissues/#3629ã DictAspect Jacksonåºå忥é----- |
| | | } catch (JsonProcessingException e) { |
| | | log.error("jsonè§£æå¤±è´¥" + e.getMessage(), e); |
| | | } |
| | | String code = field.getAnnotation(Dict.class).dicCode(); |
| | | String text = field.getAnnotation(Dict.class).dicText(); |
| | | String table = field.getAnnotation(Dict.class).dictTable(); |
| | | //update-begin--Author:scott -- Date:20211223 ----forï¼ãissues/3303ãrestcontrollerè¿åjsonæ°æ®åkey顺åºéä¹± ----- |
| | | JSONObject item = JSONObject.parseObject(json, Feature.OrderedField); |
| | | //update-end--Author:scott -- Date:20211223 ----forï¼ãissues/3303ãrestcontrollerè¿åjsonæ°æ®åkey顺åºéä¹± ----- |
| | | |
| | | List<String> dataList; |
| | | String dictCode = code; |
| | | if (!StringUtils.isEmpty(table)) { |
| | | dictCode = String.format("%s,%s,%s", table, text, code); |
| | | //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<String> 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æ ¼å¼åæ¥æ |
| | | //update-begin--Author:zyf -- Date:20220531 ----forï¼ãissues/#3629ã DictAspect Jacksonåºå忥é----- |
| | | //if (JAVA_UTIL_DATE.equals(field.getType().getName())&&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())))); |
| | | //} |
| | | //update-end--Author:zyf -- Date:20220531 ----forï¼ãissues/#3629ã DictAspect Jacksonåºå忥é----- |
| | | } |
| | | dataList = dataListMap.computeIfAbsent(dictCode, k -> new ArrayList<>()); |
| | | this.listAddAllDeduplicate(dataList, Arrays.asList(value.split(","))); |
| | | } |
| | | //dateç±»åé»è®¤è½¬æ¢stringæ ¼å¼åæ¥æ |
| | | //update-begin--Author:zyf -- Date:20220531 ----forï¼ãissues/#3629ã DictAspect Jacksonåºå忥é----- |
| | | //if (JAVA_UTIL_DATE.equals(field.getType().getName())&&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())))); |
| | | //} |
| | | //update-end--Author:zyf -- Date:20220531 ----forï¼ãissues/#3629ã DictAspect Jacksonåºå忥é----- |
| | | } |
| | | items.add(item); |
| | | } |
| | | |
| | | //step.2 è°ç¨ç¿»è¯æ¹æ³ï¼ä¸æ¬¡æ§ç¿»è¯ |
| | | Map<String, List<DictModel>> 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); |
| | | items.add(item); |
| | | } |
| | | |
| | | String value = record.getString(field.getName()); |
| | | if (oConvertUtils.isNotEmpty(value)) { |
| | | List<DictModel> dictModels = translText.get(fieldDictCode); |
| | | if(dictModels==null || dictModels.size()==0){ |
| | | continue; |
| | | //step.2 è°ç¨ç¿»è¯æ¹æ³ï¼ä¸æ¬¡æ§ç¿»è¯ |
| | | Map<String, List<DictModel>> 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<DictModel> 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); |
| | | } |
| | | } |
| | | |
| | | 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); |
| | | } |
| | |
| | | * 䏿¬¡æ§æææçåå
¸é½ç¿»è¯äº |
| | | * 1. ææçæ®éæ°æ®åå
¸çæææ°æ®åªæ§è¡ä¸æ¬¡SQL |
| | | * 2. 表åå
¸ç¸åçæææ°æ®åªæ§è¡ä¸æ¬¡SQL |
| | | * |
| | | * @param dataListMap |
| | | * @return |
| | | */ |
| | |
| | | } |
| | | |
| | | /** |
| | | * ç¿»è¯åå
¸ææ¬ |
| | | * ç¿»è¯åå
¸ææ¬ |
| | | * |
| | | * @param code |
| | | * @param text |
| | | * @param table |
| | |
| | | */ |
| | | @Deprecated |
| | | private String translateDictValue(String code, String text, String table, String key) { |
| | | if(oConvertUtils.isEmpty(key)) { |
| | | return null; |
| | | } |
| | | StringBuffer textValue=new StringBuffer(); |
| | | if (oConvertUtils.isEmpty(key)) { |
| | | return null; |
| | | } |
| | | StringBuffer textValue = new StringBuffer(); |
| | | String[] keys = key.split(","); |
| | | for (String k : keys) { |
| | | String tmpValue = null; |
| | | log.debug(" åå
¸ key : "+ k); |
| | | log.debug(" åå
¸ key : " + k); |
| | | if (k.trim().length() == 0) { |
| | | continue; //è·³è¿å¾ªç¯ |
| | | } |
| | | //update-begin--Author:scott -- Date:20210531 ----forï¼ !56 ä¼åå¾®æå¡åºç¨ä¸åå¨è¡¨å段éè¦åå
¸ç¿»è¯æ¶å è½½ç¼æ
¢é®é¢----- |
| | | if (!StringUtils.isEmpty(table)){ |
| | | log.debug("--DictAspect------dicTable="+ table+" ,dicText= "+text+" ,dicCode="+code); |
| | | String keyString = String.format("sys:cache:dictTable::SimpleKey [%s,%s,%s,%s]",table,text,code,k.trim()); |
| | | if (redisTemplate.hasKey(keyString)){ |
| | | if (!StringUtils.isEmpty(table)) { |
| | | log.debug("--DictAspect------dicTable=" + table + " ,dicText= " + text + " ,dicCode=" + code); |
| | | String keyString = String.format("sys:cache:dictTable::SimpleKey [%s,%s,%s,%s]", table, text, code, k.trim()); |
| | | if (redisTemplate.hasKey(keyString)) { |
| | | try { |
| | | tmpValue = oConvertUtils.getString(redisTemplate.opsForValue().get(keyString)); |
| | | } catch (Exception e) { |
| | | log.warn(e.getMessage()); |
| | | } |
| | | }else { |
| | | tmpValue= commonApi.translateDictFromTable(table,text,code,k.trim()); |
| | | } else { |
| | | tmpValue = commonApi.translateDictFromTable(table, text, code, k.trim()); |
| | | } |
| | | }else { |
| | | String keyString = String.format("sys:cache:dict::%s:%s",code,k.trim()); |
| | | if (redisTemplate.hasKey(keyString)){ |
| | | } else { |
| | | String keyString = String.format("sys:cache:dict::%s:%s", code, k.trim()); |
| | | if (redisTemplate.hasKey(keyString)) { |
| | | try { |
| | | tmpValue = oConvertUtils.getString(redisTemplate.opsForValue().get(keyString)); |
| | | } catch (Exception e) { |
| | | log.warn(e.getMessage()); |
| | | log.warn(e.getMessage()); |
| | | } |
| | | }else { |
| | | } else { |
| | | tmpValue = commonApi.translateDict(code, k.trim()); |
| | | } |
| | | } |
| | |
| | | |
| | | /** |
| | | * æ£æµè¿åç»æé䏿¯å¦å
å«Dict注解 |
| | | * |
| | | * @param records |
| | | * @return |
| | | */ |
| | | private Boolean checkHasDict(List<Object> records){ |
| | | if(oConvertUtils.isNotEmpty(records) && records.size()>0){ |
| | | private Boolean checkHasDict(List<Object> records) { |
| | | if (oConvertUtils.isNotEmpty(records) && records.size() > 0) { |
| | | for (Field field : oConvertUtils.getAllFields(records.get(0))) { |
| | | if (oConvertUtils.isNotEmpty(field.getAnnotation(Dict.class))) { |
| | | return true; |