From 42cce7d9a859083818a0e10eb3b6c80385042e47 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期六, 18 三月 2023 18:20:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java b/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
index d21b178..14f77d1 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
@@ -2,12 +2,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.enums.common.DictTypeEnum;
import com.ycl.service.dict.IDataDictionaryService;
+import com.ycl.vo.dict.DataDictionaryVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -16,6 +16,7 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -41,8 +42,15 @@
@GetMapping("/queryByCode")
@ApiOperation(("鏍规嵁code鑾峰彇瀛楁淇℃伅"))
private CommonResult<List<DataDictionary>> queryByCode(@RequestParam(value = "code") String code) {
- List<DataDictionary> dataDictionary = iDatabaseDictionaryService.queryByCode(code);
+ List<DataDictionary> dataDictionary = iDatabaseDictionaryService.queryByCode(code, null);
return CommonResult.success(dataDictionary);
+ }
+
+ @GetMapping("/queryTypeCode")
+ @ApiOperation(("鑾峰彇瀛楀吀琛ㄦ墍鏈夌被鍨�"))
+ private CommonResult<Map<String, String>> queryTypeCode() {
+ Map<String, String> s = DictTypeEnum.getAllToMap();
+ return CommonResult.success(s);
}
@GetMapping("/query_user_type")
@@ -125,11 +133,22 @@
));
}
+ @GetMapping("/query_tree_type")
+ @ApiOperation("閫氳繃绫诲瀷缂栫爜鏌ヨ鏍戝舰绫诲瀷-鍙湁涓ょ骇")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "typeCode", value = "01杩濊 02 浜嬩欢绛夌骇 03璇佷欢绫诲瀷 04鏂囧寲 05鍚嶆棌 06杩濆缓 07鐢ㄦ埛绫诲瀷 08 閮ㄩ棬绫诲瀷 09 瑙掕壊绫诲瀷 10 涔℃潙琛楅亾 11 绀惧尯"),
+ @ApiImplicitParam(name = "level", value = "1 椤剁骇 2 涓�绾у瓙绾� 3 浜岀骇瀛愮骇 4涓夌骇瀛愮骇")
+ }
+ )
+ private CommonResult queryTreeType(@RequestParam String typeCode, @RequestParam Integer level) {
+
+ List<DataDictionaryVo> list = iDatabaseDictionaryService.queryTreeType(typeCode, level);
+ return CommonResult.success(list);
+ }
+
+
@GetMapping("/addition")
@ApiOperation("閫氱敤娣诲姞")
- @ApiImplicitParams(
- @ApiImplicitParam(name = "typeCode", value = "01杩濊 02 浜嬩欢绛夌骇 03璇佷欢绫诲瀷 04鏂囧寲 05鍚嶆棌 06杩濆缓 07鐢ㄦ埛绫诲瀷 08 閮ㄩ棬绫诲瀷 09 瑙掕壊绫诲瀷 10 涔℃潙琛楅亾 11 绀惧尯")
- )
private CommonResult queryType(@RequestBody DataDictionary dataDictionary) {
return CommonResult.success(iDatabaseDictionaryService.save(dataDictionary));
}
@@ -137,7 +156,7 @@
@GetMapping("/query")
@ApiOperation("閫氱敤id鏌ヨ璇︽儏")
private CommonResult queryDictById(@RequestParam Integer id) {
- return CommonResult.success(iDatabaseDictionaryService
+ return CommonResult.success(iDatabaseDictionaryService
.list(new LambdaQueryWrapper<DataDictionary>()
.eq(DataDictionary::getParentId, id)));
}
--
Gitblit v1.8.0