diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java b/laws-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java index a013a592..4bc94c02 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java @@ -229,4 +229,6 @@ public interface ISysDictService extends IService { void deleteByIds(List idList); String queryDictText(String code, String keys); + + String queryDictTextEn(String code, String keys); } diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java index f25ac38e..5d671e48 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java @@ -536,4 +536,22 @@ public class SysDictServiceImpl extends ServiceImpl impl } return String.join(",", itemValueList); } + + @Override + public String queryDictTextEn(String code, String keys) { + SysDict sysDict = getOne(new LambdaQueryWrapper().eq(SysDict::getDictCode, code)); + List sysDictItemList = sysDictItemMapper.selectList( + new LambdaQueryWrapper().eq(SysDictItem::getDictId, sysDict.getId())); + String[] keyArr = keys.split(","); + List itemValueList = new ArrayList<>(); + for (String key : keyArr) { + Optional optionalSysDictItem = sysDictItemList.stream().filter(v -> key.equals(v.getItemValue())).findFirst(); + if (optionalSysDictItem.isPresent()){ + itemValueList.add(optionalSysDictItem.get().getEnName()); + }else { + itemValueList.add(key); + } + } + return String.join(",", itemValueList); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/common/DocumentSplitCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/common/DocumentSplitCommon.java index 01eb3a6e..e04b350a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/common/DocumentSplitCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/common/DocumentSplitCommon.java @@ -72,6 +72,10 @@ public class DocumentSplitCommon { * 翻译后缀 */ public static final String DIC_TEXT = "_dictText"; + /** + * 翻译英文后缀 + */ + public static final String DIC_TEXT_EN = "_dictTextEn"; /** * 条目类型 TEXT:文本, IMG:图片, TABLE:表格, INTERPRETATION:解读 */ @@ -95,4 +99,4 @@ public class DocumentSplitCommon { public static final String INTERPRETATION = "interpretation"; public static final String MEG_DEL = "删除成功!"; public static final String MEG_DEL_BATCH = "批量删除成功!"; -} \ No newline at end of file +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index 05e48f46..9161d652 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -392,6 +392,8 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { if(!list.isEmpty()){ List itemTextList = list.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); map.put(dbFieldName + DocumentSplitCommon.DIC_TEXT, String.join(",", itemTextList)); + List itemTextEnList = list.stream().map(SysDictItem::getEnName).collect(Collectors.toList()); + map.put(dbFieldName + DocumentSplitCommon.DIC_TEXT_EN, String.join(",", itemTextEnList)); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/job/StandardMasterPlanJob.java b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/job/StandardMasterPlanJob.java index 5ccf4223..aa288f6e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/job/StandardMasterPlanJob.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/job/StandardMasterPlanJob.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.jero.common.api.SendMessageAPI; import com.jero.common.api.dto.message.SendMessageDTO; +import com.jero.common.constant.enums.LanguageEnum; +import com.jero.common.util.MessageUtils; import com.jero.modules.laws.standard.entity.LawsDomesticStandard; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standardmasterplan.common.LawsStandardMasterPlanCommon; @@ -96,11 +98,22 @@ public class StandardMasterPlanJob implements Job { Map map = new HashMap<>(); map.put("standardNumber", standardNumber); map.put("standardName", standardName); - String applicableMarket = - sysDictService.queryDictText("market_state", lawsStandardMasterPlan.getApplicableMarket()); + String applicableMarket = ""; + String type = ""; + if(LanguageEnum.CN.equals(MessageUtils.getLanguage())) { + applicableMarket = sysDictService.queryDictText("market_state", + lawsStandardMasterPlan.getApplicableMarket()); + type = sysDictService.queryDictText("laws_standard_master_plan_type", + lawsStandardMasterPlanSublist.getType()); + }else { + applicableMarket = sysDictService.queryDictTextEn("market_state", + lawsStandardMasterPlan.getApplicableMarket()); + type = sysDictService.queryDictTextEn("laws_standard_master_plan_type", + lawsStandardMasterPlanSublist.getType()); + } + map.put("applicableMarket", applicableMarket); - String type = sysDictService.queryDictText("laws_standard_master_plan_type", - lawsStandardMasterPlanSublist.getType()); + map.put("type", type); sendMessageDTO.setMap(map); sendMessageAPI.sendMessage(sendMessageDTO);