From d33e687ff5b3fdb50e3dccf50e3a276baf2e6c5c Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期五, 17 十一月 2023 17:03:50 +0800
Subject: [PATCH] 编号
---
web/src/views/pages/login.vue | 2 +-
zt/core/src/main/java/com/zt/modules/sys/controller/SysDictTypeController.java | 23 +++++++++++++++++++++++
zt/core/src/main/java/com/zt/core/config/shiro/ShiroConfig.java | 2 +-
web/src/views/layout/main.vue | 2 +-
zt/common/src/main/java/com/zt/core/sys/dto/DictItemDto.java | 5 +++--
zt/core/src/main/java/com/zt/modules/sys/service/SysDictTypeService.java | 4 ++--
6 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/web/src/views/layout/main.vue b/web/src/views/layout/main.vue
index 1475efe..fe7ddf3 100644
--- a/web/src/views/layout/main.vue
+++ b/web/src/views/layout/main.vue
@@ -88,7 +88,7 @@
},
methods: {
async kwReplacement() {
- let res = await this.$http.get(`/sys/keyword/replacement`)
+ let res = await this.$http.get(`sys/dict/type/getDictMap`,{params:{dictType:"key_word"}})
if (res.data != null) {
this.$store.state.word = res.data
}
diff --git a/web/src/views/pages/login.vue b/web/src/views/pages/login.vue
index d1cd55f..d7e4bad 100644
--- a/web/src/views/pages/login.vue
+++ b/web/src/views/pages/login.vue
@@ -138,7 +138,7 @@
this.$refs['changePassword'].$refs['dialog'].init()
},
async kwReplacement() {
- let res = await this.$http.get(`/sys/keyword/replacement`)
+ let res = await this.$http.get(`sys/dict/type/getDictMap`,{params:{dictType:"key_word"}})
if (res.data != null) {
this.$store.state.word = res.data
}
diff --git a/zt/common/src/main/java/com/zt/core/sys/dto/DictItemDto.java b/zt/common/src/main/java/com/zt/core/sys/dto/DictItemDto.java
index fde1c87..9db1f46 100644
--- a/zt/common/src/main/java/com/zt/core/sys/dto/DictItemDto.java
+++ b/zt/common/src/main/java/com/zt/core/sys/dto/DictItemDto.java
@@ -21,12 +21,13 @@
public class DictItemDto implements Serializable {
private String dictLabel;
private String dictValue;
-
+ private String remark;
public DictItemDto() {
}
- public DictItemDto(String dictLabel, String dictValue) {
+ public DictItemDto(String dictLabel, String dictValue, String remark) {
this.dictLabel = dictLabel;
this.dictValue = dictValue;
+ this.remark = remark;
}
}
diff --git a/zt/core/src/main/java/com/zt/core/config/shiro/ShiroConfig.java b/zt/core/src/main/java/com/zt/core/config/shiro/ShiroConfig.java
index d233b0a..aff2df8 100644
--- a/zt/core/src/main/java/com/zt/core/config/shiro/ShiroConfig.java
+++ b/zt/core/src/main/java/com/zt/core/config/shiro/ShiroConfig.java
@@ -97,9 +97,9 @@
filterMap.put("/sys/oss/content2","anon");
-
filterMap.put("/sys/dict/type/all", "anon");
filterMap.put("/sys/keyword/replacement", "anon");
+ filterMap.put("/sys/dict/type/getDictMap", "anon");
filterMap.put("/captcha", "anon");
filterMap.put("/sys/config","anon");
diff --git a/zt/core/src/main/java/com/zt/modules/sys/controller/SysDictTypeController.java b/zt/core/src/main/java/com/zt/modules/sys/controller/SysDictTypeController.java
index b1be891..311c39c 100644
--- a/zt/core/src/main/java/com/zt/modules/sys/controller/SysDictTypeController.java
+++ b/zt/core/src/main/java/com/zt/modules/sys/controller/SysDictTypeController.java
@@ -20,6 +20,9 @@
import com.zt.core.shiro.ImportErrDto;
import com.zt.core.shiro.ImportUtil;
import com.zt.core.sys.dto.DictDto;
+import com.zt.core.sys.dto.DictItemDto;
+import com.zt.core.sys.dto.DictLeafDto;
+import com.zt.modules.sys.model.SysDictData;
import com.zt.modules.sys.model.SysDictType;
import com.zt.modules.sys.service.SysDictTypeService;
import io.swagger.annotations.Api;
@@ -30,8 +33,10 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 瀛楀吀绫诲瀷
@@ -142,4 +147,22 @@
return Result.ok(sysDictTypeService.getDicts());
}
+ /**
+ * 灏嗚幏鍙栧埌鐨勫叧閿瘝瀛樺叆map
+ * @return
+ */
+ @GetMapping("getDictMap")
+ @ApiOperation("瀛楀吀Map")
+ public Map<String, String> getDictMap(@RequestParam String dictType) {
+
+ List<DictDto> userDicts = sysDictTypeService.getUserDicts();
+ DictDto dict = userDicts.stream()
+ .filter(c -> c.getDictType().equals(dictType))
+ .collect(Collectors.toList()).get(0);
+ Map<String, String> keywordMap = new HashMap<>();
+ for (DictItemDto dictItemDto : ((DictLeafDto) dict).getDataList()) {
+ keywordMap.put(dictItemDto.getDictLabel(), dictItemDto.getRemark());
+ }
+ return keywordMap;
+ }
}
diff --git a/zt/core/src/main/java/com/zt/modules/sys/service/SysDictTypeService.java b/zt/core/src/main/java/com/zt/modules/sys/service/SysDictTypeService.java
index 310f4c5..aa45182 100644
--- a/zt/core/src/main/java/com/zt/modules/sys/service/SysDictTypeService.java
+++ b/zt/core/src/main/java/com/zt/modules/sys/service/SysDictTypeService.java
@@ -352,7 +352,7 @@
List<SysDictData> datas = sysDictDataService.getByType(type.getId());
if (datas.size() > 0) {
for (SysDictData data : datas) {
- DictItemDto itemDto = new DictItemDto(data.getDictLabel(), String.valueOf(data.getDictValue()));
+ DictItemDto itemDto = new DictItemDto(data.getDictLabel(), String.valueOf(data.getDictValue()), data.getRemark());
((DictLeafDto) dto).getDataList().add(itemDto);
}
list.add(dto);
@@ -375,7 +375,7 @@
dto = new DictLeafDto(type.getDictType(), type.getDictName());
List<SysDictData> datas = sysDictDataService.getByType(type.getId());
for (SysDictData data : datas) {
- DictItemDto itemDto = new DictItemDto(data.getDictLabel(), String.valueOf(data.getDictValue()));
+ DictItemDto itemDto = new DictItemDto(data.getDictLabel(), String.valueOf(data.getDictValue()),data.getRemark());
((DictLeafDto) dto).getDataList().add(itemDto);
}
}
--
Gitblit v1.9.1