From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DictionaryApi.java | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DictionaryApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DictionaryApi.java
index 0147b52..bc40457 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DictionaryApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DictionaryApi.java
@@ -1,19 +1,24 @@
package com.panzhihua.service_community.api;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.model.vos.BcDictionaryItemVO;
import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.DictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.BcDictionaryService;
+
import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
-import javax.annotation.Resource;
-import java.util.List;
-
-/** 字典
+/**
+ * 字典
+ *
* @author xyh
* @date 2021/6/11 16:11
*/
@@ -27,39 +32,46 @@
/**
* 插入字典
- * @param dictionaryVO 字典数据
+ *
+ * @param dictionaryVO
+ * 字典数据
* @return Boolean 是否保存成功
* @author manailin
* @date 2021/6/10 17:00
*/
@PostMapping("/insertDiction")
- R insertDiction(@RequestBody DictionaryVO dictionaryVO, @ApiIgnore BindingResult results){
+ R insertDiction(@RequestBody DictionaryVO dictionaryVO, @ApiIgnore BindingResult results) {
if (results.hasErrors()) {
return R.fail(results.getFieldError().getDefaultMessage());
}
return bcDictionaryService.insertDiction(dictionaryVO);
}
+
/**
* 插入字典项
- * @param dictionaryVO 字典数据
+ *
+ * @param dictionaryVO
+ * 字典数据
* @return Boolean 是否保存成功
* @author manailin
* @date 2021/6/10 17:00
*/
@PostMapping("/insertDictionItem")
- R insertDictionItem(@RequestBody BcDictionaryVO dictionaryVO, @ApiIgnore BindingResult results){
+ R insertDictionItem(@RequestBody BcDictionaryVO dictionaryVO, @ApiIgnore BindingResult results) {
if (results.hasErrors()) {
return R.fail(results.getFieldError().getDefaultMessage());
}
return bcDictionaryService.insertDictionItem(dictionaryVO);
}
+
/**
* 根据字典key查询自典项
+ *
* @param key
* @return
*/
@GetMapping("/listDictionaryByKey")
- R<List<BcDictionaryVO>> listDictionaryByKey(@RequestParam("key")String key){
+ R<List<BcDictionaryVO>> listDictionaryByKey(@RequestParam("key") String key) {
return bcDictionaryService.getDictionaryByKey(key);
}
@@ -67,13 +79,14 @@
/**
* description 根据字典code查询自典项
*
- * @param code 入参参数
+ * @param code
+ * 入参参数
* @return BcDictionaryVO 字典
* @author manailin
* @date 2021/6/10 17:00
*/
@GetMapping("/getByCode")
- BcDictionaryItemVO getByCode(@RequestParam("dictId") String dictId, @RequestParam("code")String code){
- return bcDictionaryService.getByCode(dictId,code);
+ BcDictionaryItemVO getByCode(@RequestParam("dictId") String dictId, @RequestParam("code") String code) {
+ return bcDictionaryService.getByCode(dictId, code);
}
}
--
Gitblit v1.7.1