From 31d431d2f4620aceb7ad6727a4b48f15e41c6f8a Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 2 Mar 2022 14:40:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=86=85=E5=AE=B9=E4=B8=AD=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysDictController.java  | 13 ++++++++++
 .../system/service/ISysDictService.java       |  1 +
 .../service/impl/SysDictServiceImpl.java      | 26 +++++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java
index 6d06a5737..0b93861b4 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java
@@ -183,6 +183,19 @@ public class SysDictController {
 		return Result.OK(res);
 	}
 
+	/**
+	 * 获取全部字典数据(中英文切换)
+	 *
+	 * @return
+	 */
+	@ApiOperation(value = "字典控制器-获取全部字典数据", notes = "字典控制器-获取全部字典数据")
+	@RequestMapping(value = "/queryAllDictItemsByCut", method = RequestMethod.GET)
+	public Result<?> queryAllDictItemsByCut(HttpServletRequest request,String cut) {
+		Map<String, List<DictModel>> res = new HashMap<String, List<DictModel>>();
+		res = sysDictService.queryAllDictItemsByCut(cut);
+		return Result.OK(res);
+	}
+
 	/**
 	 * 获取字典数据
 	 * @param dictCode
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java
index dfef477b9..46df65251 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java
@@ -23,6 +23,7 @@ public interface ISysDictService extends IService<SysDict> {
     public List<DictModel> queryDictItemsByCode(String code);
 
     public Map<String,List<DictModel>> queryAllDictItems();
+    public Map<String,List<DictModel>> queryAllDictItemsByCut(String cut);
 
     @Deprecated
     List<DictModel> queryTableDictItemsByCode(String table, String text, String code);
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
index 8f200416b..d51a7fd6a 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.CacheConstant;
 import com.jero.common.constant.CommonConstant;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.DictQuery;
 import com.jero.common.util.oConvertUtils;
@@ -88,6 +89,31 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 		return res;
 	}
 
+	@Override
+	public Map<String, List<DictModel>> queryAllDictItemsByCut(String cut) {
+		Map<String, List<DictModel>> res = new HashMap<String, List<DictModel>>();
+		List<SysDict> ls = sysDictMapper.selectList(null);
+		LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<SysDictItem>();
+		queryWrapper.eq(SysDictItem::getStatus, 1);
+		queryWrapper.orderByAsc(SysDictItem::getSortOrder);
+		List<SysDictItem> sysDictItemList = sysDictItemMapper.selectList(queryWrapper);
+		for (SysDict d : ls) {
+			List<DictModel> dictModelList = sysDictItemList.stream().filter(s -> d.getId().equals(s.getDictId())).map(item -> {
+				DictModel dictModel = new DictModel();
+				if(CutEnum.CN.getValue().equals(cut)){
+					dictModel.setText(item.getItemText());
+				}else{
+					dictModel.setText(item.getEnName());
+				}
+				dictModel.setValue(item.getItemValue());
+				return dictModel;
+			}).collect(Collectors.toList());
+			res.put(d.getDictCode(), dictModelList);
+		}
+		log.debug("-------登录加载系统字典-----" + res.toString());
+		return res;
+	}
+
 	/**
 	 * 通过查询指定code 获取字典值text
 	 * @param code