From cfce5a0402f09b7f7891f045a77b8a9ceea69e1f Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 04 三月 2021 23:29:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java
index d77f126..9a93de2 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java
@@ -2,10 +2,12 @@
import cc.mrbird.febs.common.core.entity.FebsResponse;
import cc.mrbird.febs.common.core.entity.QueryRequest;
+import cc.mrbird.febs.common.core.entity.system.Dic;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.server.system.service.IDicItemService;
+import cc.mrbird.febs.server.system.service.IDicService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -34,24 +36,31 @@
private final IDicItemService dicitemService;
+ private final IDicService dicService;
+
@GetMapping
-@PreAuthorize("hasAuthority('dicitem:list')")
public FebsResponse getAllDicitems(DicItem dicitem) {
return new FebsResponse().data(dicitemService.findDicItems(dicitem));
}
-
+ @GetMapping(value = "/type/{dictType}")
+ public FebsResponse dictType(@PathVariable String dictType)
+ {
+ DicItem dicItem=new DicItem();
+ dicItem.setDicCode(dictType);
+ return new FebsResponse().data(dicitemService.findDicItems(dicItem));
+ }
@GetMapping("list")
-@PreAuthorize("hasAuthority('dicitem:list')")
public FebsResponse dicitemList(QueryRequest request, DicItem dicitem) {
Map<String, Object> dataTable = FebsUtil.getDataTable(this.dicitemService.findDicItems(request, dicitem));
return new FebsResponse().data(dataTable);
}
@PostMapping
-@PreAuthorize("hasAuthority('dicitem:add')")
public void addDicItem(@Valid DicItem dicitem) throws FebsException {
try {
-this.dicitemService.createDicItem(dicitem);
+ Dic byId = dicService.getById(dicitem.getDicId());
+ dicitem.setDicCode(byId.getDicCode());
+ this.dicitemService.createDicItem(dicitem);
} catch (Exception e) {
String message = "新增数据字典项失败";
log.error(message, e);
@@ -60,7 +69,6 @@
}
@DeleteMapping
-@PreAuthorize("hasAuthority('dicitem:delete')")
public void deleteDicItem(DicItem dicitem) throws FebsException {
try {
this.dicitemService.deleteDicItem(dicitem);
@@ -72,7 +80,6 @@
}
@DeleteMapping("{ids}")
-@PreAuthorize("hasAuthority('dicitem:delete')")
public void logicDeleteDicItem(@PathVariable("ids") String ids) throws FebsException {
try {
this.dicitemService.logicDelDicItem(ids);
@@ -84,9 +91,11 @@
}
@PutMapping
-@PreAuthorize("hasAuthority('dicitem:update')")
+
public void updateDicItem(DicItem dicitem) throws FebsException {
try {
+ Dic byId = dicService.getById(dicitem.getDicId());
+ dicitem.setDicCode(byId.getDicCode());
this.dicitemService.updateDicItem(dicitem);
} catch (Exception e) {
String message = "修改数据字典项失败";
--
Gitblit v1.8.0