企业端，消息，个人信息修改

2021-09-29 13:55:26 +08:00
parent 5fe1befb5d
commit 664e085c45
15 changed files with 235 additions and 371 deletions
@@ -106,6 +106,46 @@ public class DictAspect {
                    items.add(item);
                }
                ((IPage) ((Result) result).getResult()).setRecords(items);
+            }else {
+                Object record = (Object) ((Result) result).getResult();
+                ObjectMapper mapper = new ObjectMapper();
+                String json = "{}";
+                try {
+                    //解决@JsonFormat注解解析不了的问题详见SysAnnouncement类的@JsonFormat
+                    json = mapper.writeValueAsString(record);
+                } catch (JsonProcessingException e) {
+                    log.error("json解析失败" + e.getMessage(), e);
+                }
+                try {
+                    JSONObject item = JSONObject.parseObject(json);
+                    //update-begin--Author:scott -- Date:20190603 ----for：解决继承实体字段无法翻译问题------
+                    //for (Field field : record.getClass().getDeclaredFields()) {
+                    for (Field field : oConvertUtils.getAllFields(record)) {
+                        //update-end--Author:scott  -- Date:20190603 ----for：解决继承实体字段无法翻译问题------
+                        if (field.getAnnotation(Dict.class) != null) {
+                            String code = field.getAnnotation(Dict.class).dicCode();
+                            String text = field.getAnnotation(Dict.class).dicText();
+                            String table = field.getAnnotation(Dict.class).dictTable();
+                            String key = String.valueOf(item.get(field.getName()));
+
+                            //翻译字典值对应的txt
+                            String textValue = translateDictValue(code, text, table, key);
+
+                            log.debug(" 字典Val : " + textValue);
+                            log.debug(" __翻译字典字段__ " + field.getName() + CommonConstant.DICT_TEXT_SUFFIX + "： " + textValue);
+                            item.put(field.getName() + CommonConstant.DICT_TEXT_SUFFIX, textValue);
+                        }
+                        //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()))));
+                        }
+                    }
+//                }
+                    ((Result) result).setResult(item);
+                }catch (Exception e){
+                    log.info("########################此返回类型不支持字典翻译########################");
+                }
            }
        }
    }