From 8d0d1a0ddbfb791c622171f9ec34f507a135c9b2 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 23 Feb 2022 14:53:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/common/constant/enums/CutEnum.java | 37 ++++++++++++++ .../BussDocumentLibraryEOController.java | 25 ++++++---- .../IBussDocumentLibraryEOService.java | 12 ++--- .../BussDocumentLibraryEOServiceImpl.java | 48 ++++++++++++------- 4 files changed, 89 insertions(+), 33 deletions(-) create mode 100644 jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/CutEnum.java diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/CutEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/CutEnum.java new file mode 100644 index 000000000..fd1ca5a71 --- /dev/null +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/CutEnum.java @@ -0,0 +1,37 @@ +package com.jero.common.constant.enums; + +/** + * 中英文切换标识 + * @description + * @date 2022/1/21 15:22 + * @auth zhn + */ +public enum CutEnum { + CN("中文","cn"), + EN("英文","en"); + + + String name; + String value; + + private CutEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java index 0b0b3b5d2..cd1103d5a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java @@ -184,8 +184,9 @@ public class BussDocumentLibraryEOController extends JeroController>> queryCondition(@RequestParam(name="flag",required=true) String flag) { - List> list = bussDocumentLibraryEOService.queryCondition(flag); + public Result>> queryCondition(@RequestParam(name="flag",required=true) String flag, + @RequestParam(name="cut",required=true) String cut) { + List> list = bussDocumentLibraryEOService.queryCondition(flag,cut); return Result.OK(list); } @@ -197,8 +198,9 @@ public class BussDocumentLibraryEOController extends JeroController>> getHeader(@RequestParam(name="flag",required=true) String flag) { - List> list = bussDocumentLibraryEOService.getHeader(flag); + public Result>> getHeader(@RequestParam(name="flag",required=true) String flag, + @RequestParam(name="cut",required=true) String cut) { + List> list = bussDocumentLibraryEOService.getHeader(flag,cut); return Result.OK(list); } @@ -210,8 +212,9 @@ public class BussDocumentLibraryEOController extends JeroController>> getAddForm(@RequestParam(name="flag",required=true) String flag) { - List> list = bussDocumentLibraryEOService.getAddForm(flag); + public Result>> getAddForm(@RequestParam(name="flag",required=true) String flag, + @RequestParam(name="cut",required=true) String cut) { + List> list = bussDocumentLibraryEOService.getAddForm(flag,cut); return Result.OK(list); } @@ -223,8 +226,9 @@ public class BussDocumentLibraryEOController extends JeroController>> getDocumentInfoById(@RequestParam(name="id",required=true) String id) { - List> list = bussDocumentLibraryEOService.getDocumentInfoById(id); + public Result>> getDocumentInfoById(@RequestParam(name="id",required=true) String id, + @RequestParam(name="cut",required=true) String cut) { + List> list = bussDocumentLibraryEOService.getDocumentInfoById(id,cut); return Result.OK(list); } /** @@ -235,8 +239,9 @@ public class BussDocumentLibraryEOController extends JeroController>> getInfoById(@RequestParam(name="id",required=true) String id) { - List> list = bussDocumentLibraryEOService.getInfoById(id); + public Result>> getInfoById(@RequestParam(name="id",required=true) String id, + @RequestParam(name="cut",required=true) String cut) { + List> list = bussDocumentLibraryEOService.getInfoById(id,cut); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java index 37c7524b0..69bb5a780 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java @@ -51,35 +51,35 @@ public interface IBussDocumentLibraryEOService extends IService> queryCondition(String flag); + List> queryCondition(String flag,String cut); /** * 列表表头 * * @return */ - List> getHeader(String flag); + List> getHeader(String flag,String cut); /** * 新增表单 * * @return */ - List> getAddForm(String flag); + List> getAddForm(String flag,String cut); /** - * 详情,编辑数据查询 + * 编辑数据查询 * @param id * @return */ - List> getDocumentInfoById(String id); + List> getDocumentInfoById(String id,String cut); /** * 详情数据查询 * @param id * @return */ - List> getInfoById(String id); + List> getInfoById(String id,String cut); /** * 新增数据 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 3e62de327..1ca68ead9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.system.vo.LoginUser; @@ -124,7 +125,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> queryCondition(String flag) { + public List> queryCondition(String flag,String cut) { List fieldList = onlCgformFieldService.getFieldList(flag); if (fieldList.size() != 0) { //过滤出搜索条件() @@ -136,8 +137,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> getHeader(String flag) { + public List> getHeader(String flag,String cut) { List fieldList = onlCgformFieldService.getFieldList(flag); if (fieldList.size() != 0) { //过滤列表字段(is_show_list-->列表是否显示0否 1是) @@ -164,8 +168,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> getAddForm(String flag) { + public List> getAddForm(String flag,String cut) { OnlCgformArea onlCgformArea = new OnlCgformArea(); onlCgformArea.setIsModel(ModuleEnum.DOCUMENT_LIBRARY.getValue()); //区域管理 @@ -194,7 +201,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList()); for (OnlCgformField onlCgformField : fieldListTemp) { Map map = new HashMap<>(); - mapPut(map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea()); + mapPut(cut,map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea()); map.put("field_must_input", onlCgformField.getFieldMustInput());//区域 result.add(map); } @@ -209,7 +216,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> getDocumentInfoById(String id) { + public List> getDocumentInfoById(String id,String cut) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(BussDocumentLibraryEO::getId, id); //通过id查询数据 @@ -224,7 +231,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> getInfoById(String id) { + public List> getInfoById(String id,String cut) { //区域管理 List areaList = onlCgformAreaServiceImpl.queryList(new OnlCgformArea()); //字段属性 @@ -288,14 +295,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl mapNew = new HashMap<>(); mapNew.put("value", fileInfo); - mapPut(mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea()); + mapPut(cut,mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea()); resultTemp.add(mapNew); } } } else { //单个文件处理 map.put("value", fileInfos.get(0)); - mapPut(map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea()); + mapPut(cut,map, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", onlCgformAreaTemp.getShowArea()); resultTemp.add(map); } } @@ -308,7 +315,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map, String field_show_type, String fieldShowType2, String dict_field, String dictField, String db_field_name, String dbFieldName2, String db_field_txt, String dbFieldTxt, String db_field_en_name, String dbFieldEnName, String area, String showArea) { + private void mapPut(String cut,Map map, String field_show_type, String fieldShowType2, String dict_field, String dictField, String db_field_name, String dbFieldName2, String db_field_txt, String dbFieldTxt, String db_field_en_name, String dbFieldEnName, String area, String showArea) { map.put(field_show_type, fieldShowType2);//类型(判断是下拉还是输入框,等等) map.put(dict_field, dictField); map.put(db_field_name, dbFieldName2);//字段 - map.put(db_field_txt, dbFieldTxt);//字段中文名 - map.put(db_field_en_name, dbFieldEnName);//字段英文名 + if(StringUtils.isNotBlank(cut)){ + if(CutEnum.CN.equals(cut)){ + map.put(db_field_txt, dbFieldTxt);//字段中文名 + }else{ + map.put(db_field_txt, dbFieldEnName);//字段中文名 + } + }else{ + map.put(db_field_txt, dbFieldTxt);//字段中文名 + } map.put(area, showArea);//区域 } @@ -561,7 +575,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> mapList = queryCondition("1"); + List> mapList = queryCondition("1",null); //查询条件处理 for (Map.Entry entry : parameter.entrySet()) {