From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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..ec98475 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,7 +2,6 @@
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;
@@ -16,6 +15,7 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -43,6 +43,13 @@
private CommonResult<List<DataDictionary>> queryByCode(@RequestParam(value = "code") String code) {
List<DataDictionary> dataDictionary = iDatabaseDictionaryService.queryByCode(code);
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")
@@ -127,9 +134,6 @@
@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 +141,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