From 00ab8406d85d87c5fae96724d0908db75ea9cf3d Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 15 Apr 2022 15:41:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E4=B8=AD=E8=8B=B1=E6=96=87=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/fallback/SysBaseAPIFallback.java | 5 ++++ .../java/com/jero/common/api/CommonAPI.java | 8 +++++++ .../java/com/jero/common/api/vo/Result.java | 24 +++++++++++++------ .../com/jero/common/aspect/DictAspect.java | 21 +++++++++++----- .../modules/system/mapper/SysDictMapper.java | 10 ++++---- .../system/mapper/xml/SysDictMapper.xml | 6 +++++ .../system/service/ISysDictService.java | 1 + .../system/service/impl/SysBaseApiImpl.java | 9 +++++-- .../service/impl/SysDictServiceImpl.java | 6 +++++ .../BussDocumentLibraryEOServiceImpl.java | 2 -- .../DummyInventoryBaseEOController.java | 2 +- 11 files changed, 72 insertions(+), 22 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-api/jero-system-cloud-api/src/main/java/com/jero/common/system/api/fallback/SysBaseAPIFallback.java b/jero-boot/jero-boot-base/jero-boot-base-api/jero-system-cloud-api/src/main/java/com/jero/common/system/api/fallback/SysBaseAPIFallback.java index 98b53c10b..f8601c33a 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-api/jero-system-cloud-api/src/main/java/com/jero/common/system/api/fallback/SysBaseAPIFallback.java +++ b/jero-boot/jero-boot-base/jero-boot-base-api/jero-system-cloud-api/src/main/java/com/jero/common/system/api/fallback/SysBaseAPIFallback.java @@ -229,6 +229,11 @@ public class SysBaseAPIFallback implements ISysBaseAPI { return null; } + @Override + public String translateDictEn(String code, String key, String cut) { + return null; + } + @Override public List queryPermissionDataRule(String component, String requestPath, String username) { return null; diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/CommonAPI.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/CommonAPI.java index e76148d06..9ce077a19 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/CommonAPI.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/CommonAPI.java @@ -64,6 +64,14 @@ public interface CommonAPI { */ String translateDict(String code, String key); + /** + * 数据字典英文 + * @param code + * @param key + * @return + */ + String translateDictEn(String code, String key,String cut); + /** * 8查询数据权限 * @return diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java index 2bb004d01..d8d06ee70 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java @@ -3,6 +3,7 @@ package com.jero.common.api.vo; import java.io.Serializable; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.jero.common.constant.enums.CutEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.jero.common.constant.CommonConstant; @@ -31,18 +32,24 @@ public class Result implements Serializable { @ApiModelProperty(value = "返回处理消息") private String message = "操作成功！"; + /** + * 返回处理消息 + */ + @ApiModelProperty(value = "中英文切换标识") + private String cut = "操作成功！"; + /** * 返回代码 */ @ApiModelProperty(value = "返回代码") private Integer code = 0; - + /** * 返回数据对象 data */ @ApiModelProperty(value = "返回数据对象") private T result; - + /** * 时间戳 */ @@ -50,9 +57,9 @@ public class Result implements Serializable { private long timestamp = System.currentTimeMillis(); public Result() { - + } - + public Result success(String message) { this.message = message; this.code = CommonConstant.SC_OK_200; @@ -108,14 +115,17 @@ public class Result implements Serializable { r.setSuccess(true); r.setCode(CommonConstant.SC_OK_200); r.setMessage(msg); + if(CutEnum.CN.getValue().equals(msg) || CutEnum.EN.getValue().equals(msg)){ + r.setCut(msg); + } r.setResult(data); return r; } - + public static Result error(String msg) { return error(CommonConstant.SC_INTERNAL_SERVER_ERROR_500, msg); } - + public static Result error(int code, String msg) { Result r = new Result(); r.setCode(code); @@ -140,4 +150,4 @@ public class Result implements Serializable { @JsonIgnore private String onlTable; -} \ No newline at end of file +} 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 c4e624a47..8da047427 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 @@ -5,6 +5,7 @@ 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 com.jero.common.constant.enums.CutEnum; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -80,11 +81,12 @@ public class DictAspect { * @param result */ private void parseDictText(Object result) { + String cut = ((Result) result).getCut(); if (result instanceof Result) { if (((Result) result).getResult() instanceof IPage) { List items = new ArrayList<>(); for (Object record : ((IPage) ((Result) result).getResult()).getRecords()) { - JSONObject item = getJsonObject(record); + JSONObject item = getJsonObject(record,cut); items.add(item); } ((IPage) ((Result) result).getResult()).setRecords(items); @@ -94,7 +96,7 @@ public class DictAspect { if(!"java.util.LinkedHashMap".equals(name) && !"java.util.HashMap".equals(name)){ List items = new ArrayList<>(); for (Object record : (List)((Result) result).getResult()) { - JSONObject item = getJsonObject(record); + JSONObject item = getJsonObject(record,cut); items.add(item); } ((Result) result).setResult(items); @@ -103,7 +105,7 @@ public class DictAspect { } } - private JSONObject getJsonObject(Object record) { + private JSONObject getJsonObject(Object record,String cut) { ObjectMapper mapper = new ObjectMapper(); String json = "{}"; try { @@ -124,7 +126,7 @@ public class DictAspect { String key = String.valueOf(item.get(field.getName())); //翻译字典值对应的txt - String textValue = translateDictValue(code, text, table, key); + String textValue = translateDictValue(code, text, table, key,cut); log.debug(" 字典Val : " + textValue); log.debug(" __翻译字典字段__ " + field.getName() + CommonConstant.DICT_TEXT_SUFFIX + "： " + textValue); @@ -147,7 +149,7 @@ public class DictAspect { * @param key * @return */ - private String translateDictValue(String code, String text, String table, String key) { + private String translateDictValue(String code, String text, String table, String key,String cut) { if(oConvertUtils.isEmpty(key)) { return null; } @@ -163,13 +165,20 @@ public class DictAspect { log.debug("--DictAspect------dicTable="+ table+" ,dicText= "+text+" ,dicCode="+code); tmpValue= commonAPI.translateDictFromTable(table,text,code,k.trim()); }else { - tmpValue = commonAPI.translateDict(code, k.trim()); + if(CutEnum.CN.getValue().equals(cut)){ + tmpValue = commonAPI.translateDict(code, k.trim()); + }else if(CutEnum.EN.getValue().equals(cut)){ + tmpValue = commonAPI.translateDictEn(code, k.trim(),cut); + } + } if (tmpValue != null) { if (!"".equals(textValue.toString())) { textValue.append(","); } textValue.append(tmpValue); + }else{ + tmpValue = ""; } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java index 8a4d32de2..a94ef2d79 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java @@ -24,7 +24,7 @@ import java.util.Map; * @since 2018-12-28 */ public interface SysDictMapper extends BaseMapper { - + /** * 重复检查SQL * @return @@ -32,7 +32,7 @@ public interface SysDictMapper extends BaseMapper { public Long duplicateCheckCountSql(DuplicateCheckVo duplicateCheckVo); public Long duplicateCheckCountSqlNoDataId(DuplicateCheckVo duplicateCheckVo); - + public List queryDictItemsByCode(@Param("code") String code); @Deprecated @@ -47,6 +47,8 @@ public interface SysDictMapper extends BaseMapper { public String queryDictTextByKey(@Param("code") String code,@Param("key") String key); + public String queryDictTextByKeyEn(@Param("code") String code,@Param("key") String key); + public String queryDictKeyByText(@Param("code") String code,@Param("text") String key); @Deprecated @@ -60,13 +62,13 @@ public interface SysDictMapper extends BaseMapper { * @return */ public List queryAllDepartBackDictModel(); - + /** * 查询所有用户 作为字典信息 username -->value,realname -->text * @return */ public List queryAllUserBackDictModel(); - + /** * 通过关键字查询出字典表 * @param table diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml index 8f65cc3e1..a371633b3 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml @@ -15,6 +15,12 @@ where s.dict_id = (select id from sys_dict where dict_code = #{code}) and s.item_value = #{key} + +