From b8ede729508288e1ae724fd0c516753808e7c465 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 27 三月 2021 10:07:54 +0800
Subject: [PATCH] fix(bug修复): 除基本信息外，其它信息导入后自动提交
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DiciIemController.java | 149 ++++++++++++++++++++++++++++---------------------
1 files changed, 84 insertions(+), 65 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..829b8d8 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;
@@ -13,18 +15,18 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.List;
import java.util.Map;
/**
-*
-* name:Dicitem
-* package:cc.mrbird.febs.server.system.controller
-* description:数据字典项控制器
-*
-* @author luoyibo
-* @date 2021-02-02 11:29:37
-* @since JDK1.8
-*/
+ * name:Dicitem
+ * package:cc.mrbird.febs.server.system.controller
+ * description:数据字典项控制器
+ *
+ * @author luoyibo
+ * @date 2021-02-02 11:29:37
+ * @since JDK1.8
+ */
@Slf4j
@Validated
@RestController
@@ -32,66 +34,83 @@
@RequiredArgsConstructor
public class DiciIemController {
-private final IDicItemService dicitemService;
+ private final IDicItemService dicitemService;
-@GetMapping
-@PreAuthorize("hasAuthority('dicitem:list')")
-public FebsResponse getAllDicitems(DicItem dicitem) {
-return new FebsResponse().data(dicitemService.findDicItems(dicitem));
-}
+ private final IDicService dicService;
-@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);
-}
+ @GetMapping
+ public FebsResponse getAllDicitems(DicItem dicitem) {
+ return new FebsResponse().data(dicitemService.findDicItems(dicitem));
+ }
-@PostMapping
-@PreAuthorize("hasAuthority('dicitem:add')")
-public void addDicItem(@Valid DicItem dicitem) throws FebsException {
-try {
-this.dicitemService.createDicItem(dicitem);
-} catch (Exception e) {
-String message = "新增数据字典项失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @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(value = "/types/{dictType}")
+ public List<DicItem> dictTypes(@PathVariable String dictType) {
+ DicItem dicItem = new DicItem();
+ dicItem.setDicCode(dictType);
+ return dicitemService.findDicItems(dicItem);
+ }
+ @GetMapping("list")
+ public FebsResponse dicitemList(QueryRequest request, DicItem dicitem) {
+ Map<String, Object> dataTable = FebsUtil.getDataTable(this.dicitemService.findDicItems(request, dicitem));
+ return new FebsResponse().data(dataTable);
+ }
-@DeleteMapping
-@PreAuthorize("hasAuthority('dicitem:delete')")
-public void deleteDicItem(DicItem dicitem) throws FebsException {
-try {
-this.dicitemService.deleteDicItem(dicitem);
-} catch (Exception e) {
-String message = "删除数据字典项失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @PostMapping
+ public void addDicItem(@Valid DicItem dicitem) throws FebsException {
+ try {
+ Dic byId = dicService.getById(dicitem.getDicId());
+ dicitem.setDicCode(byId.getDicCode());
+ this.dicitemService.createDicItem(dicitem);
+ } catch (Exception e) {
+ String message = "新增数据字典项失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@DeleteMapping("{ids}")
-@PreAuthorize("hasAuthority('dicitem:delete')")
-public void logicDeleteDicItem(@PathVariable("ids") String ids) throws FebsException {
-try {
-this.dicitemService.logicDelDicItem(ids);
-} catch (Exception e) {
-String message = "逻辑删除数据字典项失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping
+ public void deleteDicItem(DicItem dicitem) throws FebsException {
+ try {
+ this.dicitemService.deleteDicItem(dicitem);
+ } catch (Exception e) {
+ String message = "删除数据字典项失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
-@PutMapping
-@PreAuthorize("hasAuthority('dicitem:update')")
-public void updateDicItem(DicItem dicitem) throws FebsException {
-try {
-this.dicitemService.updateDicItem(dicitem);
-} catch (Exception e) {
-String message = "修改数据字典项失败";
-log.error(message, e);
-throw new FebsException(message);
-}
-}
+ @DeleteMapping("{ids}")
+ public void logicDeleteDicItem(@PathVariable("ids") String ids) throws FebsException {
+ try {
+ this.dicitemService.logicDelDicItem(ids);
+ } catch (Exception e) {
+ String message = "逻辑删除数据字典项失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+
+ @PutMapping
+
+ 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 = "修改数据字典项失败";
+ log.error(message, e);
+ throw new FebsException(message);
+ }
+ }
+ @GetMapping("getAllDicitemsAll")
+ public List<DicItem> getAllDicitemsAll() {
+ return dicitemService.getAllDicitemsAll();
+ }
}
--
Gitblit v1.8.0