From 979446dbec1173cfb4ce0bef1bbdeab2b073ebef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= <soldierliuli@hotmail.com>
Date: Mon, 20 Jun 2022 15:28:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ArchivesDictrionaryController.java        | 24 +++++++++++++++-
 .../controller/ArchivesTypeController.java    | 28 -------------------
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDictrionaryController.java b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDictrionaryController.java
index cbaa278..b4f4e36 100644
--- a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDictrionaryController.java
+++ b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDictrionaryController.java
@@ -6,8 +6,8 @@ import com.storeroom.annotaion.rest.AnonymousGetMapping;
 import com.storeroom.annotaion.rest.AnonymousPostMapping;
 import com.storeroom.annotaion.rest.AnonymousPutMapping;
 import com.storeroom.exception.BaseException;
-import com.storeroom.modules.dictionary.domain.ArchivesDictionary;
 import com.storeroom.modules.dictionary.service.ArchivesDictionaryService;
+import com.storeroom.modules.dictionary.service.dto.ArchivesDicStateDTO;
 import com.storeroom.modules.dictionary.service.dto.ArchivesDictionaryDTO;
 import com.storeroom.utils.ApiResponse;
 import com.storeroom.utils.StringUtils;
@@ -80,4 +80,26 @@ public class ArchivesDictrionaryController {
         }
         throw new BaseException("id异常");
     }
+
+    @ApiOperation("门类字段管理")
+    @AnonymousGetMapping("manage")
+    public ApiResponse<Object> getFieldName(@RequestParam String categoryId, Integer isDataType,Boolean isInput) {
+        if (!StringUtils.isEmpty(categoryId) && isDataType != null) {
+            ArchivesDicStateDTO dto = new ArchivesDicStateDTO();
+            dto.setCategoryId(categoryId);
+            dto.setIsDataType(isDataType);
+            dto.setIsInput(isInput);
+            return ApiResponse.success(arcdicService.getAll(dto));
+        }
+        throw new BaseException("id异常");
+    }
+
+    @ApiOperation("通过id查询门类字典")
+    @AnonymousGetMapping("query")
+    public ApiResponse<Object> getArcDic(String arcdicId) {
+        if (!StringUtils.isEmpty(arcdicId)) {
+            return ApiResponse.success(arcdicService.findById(arcdicId));
+        }
+        throw new BaseException("id异常");
+    }
 }
diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java
index cefe6c7..3e4a4d0 100644
--- a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java
+++ b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java
@@ -33,7 +33,6 @@ import java.util.*;
 public class ArchivesTypeController {
 
     private final ArchivesTypeService archivesTypeService;
-    private final ArchivesDictionaryService archivesDictionaryService;
     private final DictionaryService dictionaryService;
 
 
@@ -85,33 +84,6 @@ public class ArchivesTypeController {
         return ApiResponse.success(archivesTypeService.buildTree());
     }
 
-
-    @ApiOperation("门类字段管理")
-    @AnonymousGetMapping("manage")
-    public ApiResponse<Object> getFieldName(@RequestParam String categoryId, Integer isDataType,Boolean isInput) {
-        if (!StringUtils.isEmpty(categoryId) && isDataType != null) {
-            ArchivesDicStateDTO dto = new ArchivesDicStateDTO();
-            dto.setCategoryId(categoryId);
-            dto.setIsDataType(isDataType);
-            dto.setIsInput(isInput);
-            return ApiResponse.success(archivesDictionaryService.getAll(dto));
-        }
-        throw new BaseException("id异常");
-    }
-
-    @ApiOperation("通过id查询门类字典")
-    @AnonymousGetMapping("query")
-    public ApiResponse<Object> getArcDic(String arcdicId) {
-        if (!StringUtils.isEmpty(arcdicId)) {
-            return ApiResponse.success(archivesDictionaryService.findById(arcdicId));
-        }
-        throw new BaseException("id异常");
-    }
-
-
-
-
-
     @ApiOperation("获取档案配置下拉列表")
     @AnonymousGetMapping("arc-config")
     public ApiResponse<Object> getArcConfig() {